diff options
| author | jlam <jlam@pkgsrc.org> | 2003-09-10 16:05:09 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-09-10 16:05:09 +0000 |
| commit | d7e76ed3bc8f94707f3030488514bd1e96f653de (patch) | |
| tree | c9ab55c9cb65eabe6dee47ce21b94cb882e508d9 /security | |
| parent | 392de1c7f52be71f1a38432fca8c65192bbaeef2 (diff) | |
| download | pkgsrc-d7e76ed3bc8f94707f3030488514bd1e96f653de.tar.gz | |
Honor CFLAGS/LDFLAGS from the environment.
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssl/Makefile | 6 | ||||
| -rw-r--r-- | security/openssl/distinfo | 4 | ||||
| -rw-r--r-- | security/openssl/patches/patch-ac | 15 |
3 files changed, 18 insertions, 7 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index e472412fd2d..1fda829b4dc 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.77 2003/09/10 01:57:06 jlam Exp $ +# $NetBSD: Makefile,v 1.78 2003/09/10 16:05:09 jlam Exp $ DISTNAME= openssl-0.9.6g PKGREVISION= 2 @@ -68,7 +68,7 @@ LD_PATH_VARNAME= LD_LIBRARY_PATH .if defined(USE_RSAREF2) && ${USE_RSAREF2} == "YES" . include "../../security/rsaref/buildlink2.mk" -CONFIGURE_ARGS+= rsaref -L${BUILDLINK_PREFIX.rsaref}/lib +CONFIGURE_ARGS+= rsaref PLIST_RSAREF= ${PKGDIR}/PLIST.rsaref .endif @@ -87,4 +87,6 @@ CONFIGURE_ARGS+= irix64-mips4-cc . endif .endif +CONFIGURE_ARGS+= ${CFLAGS} ${LDFLAGS} + .include "../../mk/bsd.pkg.mk" diff --git a/security/openssl/distinfo b/security/openssl/distinfo index bcc85b634b0..7e954450583 100644 --- a/security/openssl/distinfo +++ b/security/openssl/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2003/09/10 01:57:06 jlam Exp $ +$NetBSD: distinfo,v 1.21 2003/09/10 16:05:09 jlam Exp $ SHA1 (openssl-0.9.6g.tar.gz) = 5b3cdad1d33134c97f659a8ad5dbf4ca4cf3d9c8 Size (openssl-0.9.6g.tar.gz) = 2170570 bytes @@ -6,7 +6,7 @@ SHA1 (openssl-0.9.6g-20020810-netbsd.patch.gz) = 37cf5db32ba045b8a23af71ea95ab2f Size (openssl-0.9.6g-20020810-netbsd.patch.gz) = 27608 bytes SHA1 (patch-aa) = c4766edba4704374ae67d75c2f9454bc70782eea SHA1 (patch-ab) = 9bdac032996bd97834b00cb661f79c00dc31bac1 -SHA1 (patch-ac) = cae2a44ac400833cef8b74fb051b5ef51a21436c +SHA1 (patch-ac) = 3d8fcb927da1dcf51a87b5c0cd89fadccafe0955 SHA1 (patch-ad) = 950d57633fcb494564641f9b7e6385b96912c05d SHA1 (patch-ae) = f4bf6ae5aa41b55d9978376e4e50ee10c10dd288 SHA1 (patch-af) = 25481e491acd7c2e3cd9587fe038a37e41071a24 diff --git a/security/openssl/patches/patch-ac b/security/openssl/patches/patch-ac index 73f55312be2..0aa5e76f18b 100644 --- a/security/openssl/patches/patch-ac +++ b/security/openssl/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.12 2003/09/10 01:57:06 jlam Exp $ +$NetBSD: patch-ac,v 1.13 2003/09/10 16:05:10 jlam Exp $ ---- Configure.orig Sun Aug 24 15:03:44 2003 -+++ Configure Sun Aug 24 15:05:19 2003 +--- Configure.orig Wed Sep 10 11:47:42 2003 ++++ Configure Wed Sep 10 11:56:17 2003 @@ -129,55 +129,6 @@ "gcc", "gcc:-O3::(unknown)::BN_LLONG:::", "cc", "cc:-O::(unknown):::::", @@ -179,3 +179,12 @@ $NetBSD: patch-ac,v 1.12 2003/09/10 01:57:06 jlam Exp $ ); my @WinTargets=qw(VC-NT VC-WIN32 VC-WIN16 VC-W31-16 VC-W31-32 VC-MSDOS BC-32 +@@ -673,7 +690,7 @@ + } + elsif (/^[-+]/) + { +- if (/^-[lL](.*)$/) ++ if (/^-[lL](.*)$/ or /^-Wl,(.*)$/) + { + $libs.=$_." "; + } |