diff options
| author | jlam <jlam> | 2005-05-08 12:03:56 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-05-08 12:03:56 +0000 |
| commit | 9233ebfac5a237cc9bb409d99ccdbf9a3803f376 (patch) | |
| tree | cbe8ca94551b9917f6bdc3e7fdaf4be46b9a187f /security | |
| parent | 6aab42f0dff4f754e54d7e1ddc4e0630ba4dff7d (diff) | |
| download | pkgsrc-9233ebfac5a237cc9bb409d99ccdbf9a3803f376.tar.gz | |
PKG_OPTIONS.<pkg> isn't a good approximation to PKG_OPTIONS for the
package because PKG_OPTION.<pkg> could contain negative options, which
are never part of PKG_OPTIONS. Instead, use the show-var target to
display the value. We cache it in WRAPPER_VARS and in MAKE_FLAGS to
prevent reinvoking the show-var target recursively.
Diffstat (limited to 'security')
| -rw-r--r-- | security/heimdal/buildlink3.mk | 10 | ||||
| -rw-r--r-- | security/openssl/buildlink3.mk | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk index 76258d44153..1f403d63e99 100644 --- a/security/heimdal/buildlink3.mk +++ b/security/heimdal/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2004/11/19 23:16:02 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2005/05/08 12:03:56 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ HEIMDAL_BUILDLINK3_MK:= ${HEIMDAL_BUILDLINK3_MK}+ @@ -19,7 +19,13 @@ BUILDLINK_PKGSRCDIR.heimdal?= ../../security/heimdal BUILDLINK_INCDIRS.heimdal?= include/krb5 .endif # HEIMDAL_BUILDLINK3_MK -PKG_OPTIONS.heimdal?= ${PKG_DEFAULT_OPTIONS} +.if !defined(PKG_OPTIONS.heimdal) +PKG_OPTIONS.heimdal!= \ + cd ${BUILDLINK_PKGSRCDIR.heimdal} && \ + ${MAKE} show-var ${MAKE_FLAGS} VARNAME=PKG_OPTIONS +MAKE_FLAGS+= PKG_OPTIONS.heimdal=${PKG_OPTIONS.heimdal:Q} +WRAPPER_VARS+= PKG_OPTIONS.heimdal +.endif .include "../../security/openssl/buildlink3.mk" .if !empty(PKG_OPTIONS.heimdal:Mdb4) diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk index b779915f225..55e9e012f92 100644 --- a/security/openssl/buildlink3.mk +++ b/security/openssl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.23 2004/12/24 22:02:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2005/05/08 12:03:56 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENSSL_BUILDLINK3_MK:= ${OPENSSL_BUILDLINK3_MK}+ @@ -26,7 +26,13 @@ SSLBASE= ${BUILDLINK_PREFIX.openssl} BUILD_DEFS+= SSLBASE .endif # OPENSSL_BUILDLINK3_MK -PKG_OPTIONS.openssl?= ${PKG_DEFAULT_OPTIONS} +.if !defined(PKG_OPTIONS.openssl) +PKG_OPTIONS.openssl!= \ + cd ${BUILDLINK_PKGSRCDIR.openssl} && \ + ${MAKE} show-var ${MAKE_FLAGS} VARNAME=PKG_OPTIONS +MAKE_FLAGS+= PKG_OPTIONS.openssl=${PKG_OPTIONS.openssl:Q} +WRAPPER_VARS+= PKG_OPTIONS.openssl +.endif .if !empty(PKG_OPTIONS.openssl:Mrsaref) . include "../../security/rsaref/buildlink3.mk" |