pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/openssl Use "pkgsrc/mk/dlopen.buildlink3.mk" ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d91cd01eab69
branches: trunk
changeset: 527973:d91cd01eab69
user: tron <tron%pkgsrc.org@localhost>
date: Tue Apr 17 17:04:00 2007 +0000
description:
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:
security/openssl/Makefile | 11 +++--------
security/openssl/buildlink3.mk | 4 +++-
2 files changed, 6 insertions(+), 9 deletions(-)
diffs (45 lines):
diff -r 981b4565c8d8 -r d91cd01eab69 security/openssl/Makefile
--- a/security/openssl/Makefile Tue Apr 17 15:59:50 2007 +0000
+++ b/security/openssl/Makefile Tue Apr 17 17:04:00 2007 +0000
@@ -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 @@
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 @@
done
cd ${WRKSRC} && ${PERL5} util/perlpath.pl ${PERL5}
-.include "../../mk/bsd.pkg.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r 981b4565c8d8 -r d91cd01eab69 security/openssl/buildlink3.mk
--- a/security/openssl/buildlink3.mk Tue Apr 17 15:59:50 2007 +0000
+++ b/security/openssl/buildlink3.mk Tue Apr 17 17:04:00 2007 +0000
@@ -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 @@
. include "../../security/rsaref/buildlink3.mk"
.endif
+.include "../../mk/dlopen.buildlink3.mk"
+
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
Home |
Main Index |
Thread Index |
Old Index