diff options
| author | tron <tron@pkgsrc.org> | 2007-04-17 17:04:00 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2007-04-17 17:04:00 +0000 |
| commit | 944afe7a21d2d224cba81b9d83a198db3a4a1dca (patch) | |
| tree | df8d1d830900987246cf396adc9593c2ce4df896 /security | |
| parent | bd1dc40f3bc7aca2013070f1587bb2654222faf9 (diff) | |
| download | pkgsrc-944afe7a21d2d224cba81b9d83a198db3a4a1dca.tar.gz | |
Use "pkgsrc/mk/dlopen.buildlink3.mk" instead of manually including
"pkgsrc/devel/dlcompat/buildlink3.mk" under Darwin. This might
finally fix PR pkg/36086.
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssl/Makefile | 11 | ||||
| -rw-r--r-- | security/openssl/buildlink3.mk | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index af13d67addf..f277a34e53c 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.120 2007/04/01 21:33:05 tron Exp $ +# $NetBSD: Makefile,v 1.121 2007/04/17 17:04:00 tron Exp $ OPENSSL_SNAPSHOT?= # empty OPENSSL_STABLE?= # empty @@ -99,12 +99,6 @@ PLIST_SUBST+= SHLIB_MAJOR=${OPENSSL_VERS:C/\..*$//} PKG_SYSCONFDIR.openssl?= /etc/openssl .endif -.if ${OPSYS} == "Darwin" -.include "../../devel/dlcompat/buildlink3.mk" - -LDFLAGS+= ${BUILDLINK_LDFLAGS.dlcompat} -.endif - PKG_SYSCONFSUBDIR= openssl CONF_FILES= ${PREFIX}/share/examples/openssl/openssl.cnf \ ${PKG_SYSCONFDIR}/openssl.cnf @@ -128,4 +122,5 @@ pre-configure: done cd ${WRKSRC} && ${PERL5} util/perlpath.pl ${PERL5} -.include "../../mk/bsd.pkg.mk" +.include "../../mk/dlopen.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk index 990f0604fd7..25d4f405c4d 100644 --- a/security/openssl/buildlink3.mk +++ b/security/openssl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.33 2006/12/12 21:52:37 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.34 2007/04/17 17:04:00 tron Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENSSL_BUILDLINK3_MK:= ${OPENSSL_BUILDLINK3_MK}+ @@ -39,4 +39,6 @@ MAKEVARS+= PKG_BUILD_OPTIONS.openssl . include "../../security/rsaref/buildlink3.mk" .endif +.include "../../mk/dlopen.buildlink3.mk" + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |