diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-04-22 18:42:35 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-04-22 18:42:35 +0000 |
| commit | 34462bb3faa6048105d19f8371a77f8a9b948134 (patch) | |
| tree | cf5aedd93a027176b5f7488657528306c3fd5ed6 /security/openssl | |
| parent | Tweak. (diff) | |
1. In addition to OSVERSION test, check for existence of /usr/lib/libssl.a
and don't mark BROKEN if it doesn't exist.
2. Provide a workaround for inability of recent gcc to link shared library
when -Wl,-whole-archive ld(1) option is used. This should make possible to
build the port on recent -stable or -current.
Notes
Notes:
svn path=/head/; revision=41805
Diffstat (limited to 'security/openssl')
| -rw-r--r-- | security/openssl/Makefile | 2 | ||||
| -rw-r--r-- | security/openssl/files/patch-ab | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index f5712e07f07f..154d21347264 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -17,7 +17,7 @@ MASTER_SITES= http://www.openssl.org/source/ \ MAINTAINER= ports@FreeBSD.org .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 400014 +.if ${OSVERSION} >= 400014 && exists(/usr/lib/libssl.a) FORBIDDEN= "OpenSSL is already in the base system" .endif diff --git a/security/openssl/files/patch-ab b/security/openssl/files/patch-ab index 8ad463b64eed..8fbe55b661f0 100644 --- a/security/openssl/files/patch-ab +++ b/security/openssl/files/patch-ab @@ -1,6 +1,9 @@ ---- Makefile.org.orig Sun Aug 8 12:29:52 1999 -+++ Makefile.org Sun Nov 7 18:33:37 1999 -@@ -164,7 +164,7 @@ + +$FreeBSD$ + +--- Makefile.org.orig Thu Mar 16 21:46:20 2000 ++++ Makefile.org Sun Apr 22 19:50:06 2001 +@@ -165,7 +165,7 @@ ONEDIRS=out tmp EDIRS= times doc bugs util include certs ms shlib mt demos perl sf dep VMS WDIRS= windows @@ -9,7 +12,7 @@ GENERAL= Makefile BASENAME= openssl -@@ -187,6 +187,21 @@ +@@ -189,6 +189,21 @@ do \ (cd $$i && echo "making all in $$i..." && \ $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \ @@ -20,7 +23,7 @@ + rm -f lib$$i.a lib$$i.so \ + lib$$i.so.${SHLIBVER}; \ + ${MAKE} CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='-fPIC ${CFLAG}' SDIRS='${SDIRS}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' DIRS=$$i clean all || exit 1; \ -+ ( set -x; ${CC} -shared -o lib$$i.so.${SHLIBVER} \ ++ ( set -x; ${CC} -nodefaultlibs -shared -o lib$$i.so.${SHLIBVER} \ + -Wl,-S,-soname=lib$$i.so.${SHLIBVER} \ + -Wl,${WHOLE_ARCHIVE_FLAG} lib$$i.a ) || exit 1; \ + rm -f lib$$i.a; (cd $$i ; ${MAKE} clean) || exit 1 ;\ |