- don't set -rpath for openssl binary

This commit is contained in:
Tomáš Mráz 2005-11-16 21:45:59 +00:00
parent e96bebc853
commit 20e19070fe
2 changed files with 17 additions and 1 deletions

View File

@ -0,0 +1,11 @@
--- openssl-0.9.8a/Makefile.shared.no-rpath 2005-06-23 22:47:54.000000000 +0200
+++ openssl-0.9.8a/Makefile.shared 2005-11-16 22:35:37.000000000 +0100
@@ -153,7 +153,7 @@
NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
+DO_GNU_APP=LDFLAGS="$(CFLAGS)"
#This is rather special. It's a special target with which one can link
#applications without bothering with any features that have anything to

View File

@ -23,7 +23,7 @@
Summary: The OpenSSL toolkit. Summary: The OpenSSL toolkit.
Name: openssl Name: openssl
Version: 0.9.8a Version: 0.9.8a
Release: 1 Release: 2
Source: openssl-%{version}-usa.tar.bz2 Source: openssl-%{version}-usa.tar.bz2
Source1: hobble-openssl Source1: hobble-openssl
Source2: Makefile.certificate Source2: Makefile.certificate
@ -42,6 +42,7 @@ Patch1: openssl-0.9.8a-defaults.patch
Patch2: openssl-0.9.8a-link-krb5.patch Patch2: openssl-0.9.8a-link-krb5.patch
Patch3: openssl-0.9.8a-soversion.patch Patch3: openssl-0.9.8a-soversion.patch
Patch4: openssl-0.9.8a-enginesdir.patch Patch4: openssl-0.9.8a-enginesdir.patch
Patch5: openssl-0.9.8a-no-rpath.patch
Patch6: openssl-0.9.7a-libica-autoconf.patch Patch6: openssl-0.9.7a-libica-autoconf.patch
# Added engines # Added engines
Patch20: libica-1.3.4-urandom.patch Patch20: libica-1.3.4-urandom.patch
@ -100,6 +101,7 @@ from other formats to the formats used by the OpenSSL toolkit.
%patch2 -p1 -b .krb5 %patch2 -p1 -b .krb5
%patch3 -p1 -b .soversion %patch3 -p1 -b .soversion
%patch4 -p1 -b .enginesdir %patch4 -p1 -b .enginesdir
%patch5 -p1 -b .no-rpath
%patch6 -p1 -b .libica-autoconf %patch6 -p1 -b .libica-autoconf
pushd libica-%{libicaversion} pushd libica-%{libicaversion}
@ -386,6 +388,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libssl.so.%{soversion}
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%changelog %changelog
* Wed Nov 16 2005 Tomas Mraz <tmraz@redhat.com> 0.9.8a-2
- don't set -rpath for openssl binary
* Tue Nov 8 2005 Tomas Mraz <tmraz@redhat.com> 0.9.8a-1 * Tue Nov 8 2005 Tomas Mraz <tmraz@redhat.com> 0.9.8a-1
- new upstream version - new upstream version
- patches partially renumbered - patches partially renumbered