mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

1. In addition to OSVERSION test, check for existence of /usr/lib/libssl.a

Browse Source 
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.
This commit is contained in:
Maxim Sobolev 2001-04-22 18:42:35 +00:00
parent 83113df5f2
commit 34462bb3fa
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=41805
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/openssl-beta/Makefile
View File

@ -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

13
security/openssl-beta/files/patch-ab
View File

@ -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 ;\

2
security/openssl/Makefile
View File

@ -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

13
security/openssl/files/patch-ab
View File

@ -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 ;\