kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Also link with the "dl" library when creating the shared libraries.

Browse source 
Another attempt to fix PR pkg/36086.
This commit is contained in:
tron 2007-04-26 21:11:05 +00:00
parent b627e2cc01
commit bea247486f
3 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
security/openssl/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.123 2007/04/24 14:10:37 tron Exp $
# $NetBSD: Makefile,v 1.124 2007/04/26 21:11:05 tron Exp $
OPENSSL_SNAPSHOT?= # empty
OPENSSL_STABLE?= # empty
@ -85,7 +85,7 @@ SUBST_MESSAGE.dl= Adding dynmamic link compatibility library.
SUBST_STAGE.dl= post-configure
SUBST_FILES.dl= Makefile apps/Makefile crypto/Makefile \
crypto/pkcs7/Makefile fips/Makefile test/Makefile
SUBST_SED.dl= -e "s,^EX_LIBS=,EX_LIBS=${BUILDLINK_LDFLAGS.dlcompat} ,g"
SUBST_SED.dl= -e "s,^EX_LIBS=,EX_LIBS=${DL_LDFLAGS} ,g"
.endif
.include "../../security/openssl/options.mk"

4
security/openssl/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.53 2006/09/30 04:20:24 taca Exp $
$NetBSD: distinfo,v 1.54 2007/04/26 21:11:05 tron Exp $
SHA1 (openssl-0.9.7i.tar.gz) = 4c23925744d43272fa19615454da44e01465eb06
RMD160 (openssl-0.9.7i.tar.gz) = 0dce52c5793a0c37f17b620f7d26bbf9e4fcf755
@ -7,7 +7,7 @@ SHA1 (patch-aa) = f2489178263220535bdc9b6975afee0215bd7cef
SHA1 (patch-ac) = ee8229a330cb5fcdd31cceaa14f3cadcba4858bf
SHA1 (patch-ad) = 2581d06c21ed6d1c9a554289591031a6eb66a686
SHA1 (patch-ae) = cb3ce622ef9efc4098d57b10059e5424272520c8
SHA1 (patch-af) = e8a9d803d362658e0db3f044b35794b2084b7667
SHA1 (patch-af) = ae68092ede9db0c4a29c99987965fe34bd5c6213
SHA1 (patch-ah) = 5245d7ca407af952cfa028e46cf7a54dc0f50f6f
SHA1 (patch-ai) = f960775a57551a70806517b439606099000ea97e
SHA1 (patch-ak) = 7f9960a97cbe83c381c2a4565ca3a6e4e661bf54

31
security/openssl/patches/patch-af
View file

@ -1,8 +1,8 @@
$NetBSD: patch-af,v 1.18 2005/12/27 23:40:04 reed Exp $
$NetBSD: patch-af,v 1.19 2007/04/26 21:11:05 tron Exp $
--- Makefile.org.orig 2005-06-20 00:29:54.000000000 -0400
+++ Makefile.org
@@ -28,6 +28,7 @@ INSTALLTOP=/usr/local/ssl
--- Makefile.org.orig 2005-10-11 21:20:55.000000000 +0100
+++ Makefile.org 2007-04-26 21:57:40.000000000 +0100
@@ -28,6 +28,7 @@
# Do not edit this manually. Use Configure --openssldir=DIR do change this!
OPENSSLDIR=/usr/local/ssl
@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.18 2005/12/27 23:40:04 reed Exp $
# NO_IDEA - Define to build without the IDEA algorithm
# NO_RC4 - Define to build without the RC4 algorithm
@@ -195,7 +196,7 @@ TESTS = alltests
@@ -195,7 +196,7 @@
MAKEFILE= Makefile
@ -19,7 +19,7 @@ $NetBSD: patch-af,v 1.18 2005/12/27 23:40:04 reed Exp $
MAN1=1
MAN3=3
MANSUFFIX=
@@ -291,11 +292,13 @@ link-shared:
@@ -291,11 +292,13 @@
tmp="$(SHARED_LIBS_LINK_EXTS)"; \
for i in $(SHLIBDIRS); do \
prev=lib$$i$(SHLIB_EXT); \
@ -33,7 +33,7 @@ $NetBSD: patch-af,v 1.18 2005/12/27 23:40:04 reed Exp $
done; \
fi
@@ -310,8 +313,7 @@ do_gnu-shared:
@@ -310,8 +313,7 @@
fi; \
( set -x; ${CC} ${SHARED_LDFLAGS} \
-shared -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
@ -43,7 +43,16 @@ $NetBSD: patch-af,v 1.18 2005/12/27 23:40:04 reed Exp $
-Wl,--whole-archive lib$$i.a \
-Wl,--no-whole-archive $$libs ${EX_LIBS} ) || exit 1; \
libs="-l$$i $$libs"; \
@@ -427,6 +429,7 @@ do_solaris-shared:
@@ -327,7 +329,7 @@
fi; \
( set -x; ${CC} ${SHARED_LDFLAGS} \
--verbose -dynamiclib -o lib$$i${SHLIB_EXT} \
- lib$$i.a $$libs -all_load -current_version ${SHLIB_MAJOR}.${SHLIB_MINOR} \
+ lib$$i.a $$libs ${DL_LDFLAGS} -all_load -current_version ${SHLIB_MAJOR}.${SHLIB_MINOR} \
-compatibility_version ${SHLIB_MAJOR}.`echo ${SHLIB_MINOR} | cut -d. -f1` \
-install_name ${INSTALLTOP}/lib/lib$$i${SHLIB_EXT} ) || exit 1; \
libs="-l`basename $$i${SHLIB_EXT} .dylib` $$libs"; \
@@ -427,6 +429,7 @@
-o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-Wl,-Bsymbolic \
@ -51,7 +60,7 @@ $NetBSD: patch-af,v 1.18 2005/12/27 23:40:04 reed Exp $
$${MINUSZ}allextract lib$$i.a $${MINUSZ}defaultextract \
$$libs ${EX_LIBS} ) || exit 1; \
libs="-l$$i $$libs"; \
@@ -534,7 +537,7 @@ do_hpux-shared:
@@ -534,7 +537,7 @@
# HP/UX-64bit: +forceload
# AIX: -bnogc
# SHAREDFLAGS would be:
@ -60,7 +69,7 @@ $NetBSD: patch-af,v 1.18 2005/12/27 23:40:04 reed Exp $
# Tru64 Unix: -shared \
# -set_version "${SHLIB_VERSION_HISTORY}${SHLIB_VERSION_NUMBER}"
# Solaris: -G -h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
@@ -771,16 +774,14 @@ dist:
@@ -771,16 +774,14 @@
dist_pem_h:
(cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
@ -79,7 +88,7 @@ $NetBSD: patch-af,v 1.18 2005/12/27 23:40:04 reed Exp $
@headerlist="$(EXHEADER)"; for i in $$headerlist ;\
do \
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
@@ -875,35 +876,53 @@ install_docs:
@@ -875,35 +876,53 @@
for i in doc/apps/*.pod; do \
fn=`basename $$i .pod`; \
if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \