Use "pkgsrc/mk/dlopen.buildlink3.mk" instead of manually including
"pkgsrc/devel/dlcompat/buildlink3.mk" under Darwin. This might finally fix PR pkg/36086.
This commit is contained in:
parent
bd1dc40f3b
commit
944afe7a21
2 changed files with 6 additions and 9 deletions
|
@ -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"
|
||||
|
|
|
@ -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/+$//}
|
||||
|
|
Loading…
Reference in a new issue