summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-05-08 12:03:56 +0000
committerjlam <jlam@pkgsrc.org>2005-05-08 12:03:56 +0000
commit949a7c95f1548a346529098a9cc65873a37ee220 (patch)
treecbe8ca94551b9917f6bdc3e7fdaf4be46b9a187f /databases
parent244cbb2047c4724204b212aeacc294190202c18f (diff)
downloadpkgsrc-949a7c95f1548a346529098a9cc65873a37ee220.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 'databases')
-rw-r--r--databases/openldap/buildlink3.mk13
1 files changed, 10 insertions, 3 deletions
diff --git a/databases/openldap/buildlink3.mk b/databases/openldap/buildlink3.mk
index b4b024c30c4..ee6a588373b 100644
--- a/databases/openldap/buildlink3.mk
+++ b/databases/openldap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2004/11/27 05:32:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2005/05/08 12:03:56 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENLDAP_BUILDLINK3_MK:= ${OPENLDAP_BUILDLINK3_MK}+
@@ -18,9 +18,16 @@ BUILDLINK_RECOMMENDED.openldap+= openldap>=2.2.18nb1
BUILDLINK_PKGSRCDIR.openldap?= ../../databases/openldap
.endif # OPENLDAP_BUILDLINK3_MK
-PKG_OPTIONS.openldap?= ${PKG_DEFAULT_OPTIONS}
+.if !defined(PKG_OPTIONS.openldap)
+PKG_OPTIONS.openldap!= \
+ cd ${BUILDLINK_PKGSRCDIR.openldap} && \
+ ${MAKE} show-var ${MAKE_FLAGS} VARNAME=PKG_OPTIONS
+MAKE_FLAGS+= PKG_OPTIONS.openldap=${PKG_OPTIONS.openldap:Q}
+WRAPPER_VARS+= PKG_OPTIONS.openldap
+.endif
-.if !empty(PKG_OPTIONS.openldap:Mkerberos) || !empty(PKG_OPTIONS.openldap:Msasl)
+.if !empty(PKG_OPTIONS.openldap:Mkerberos) || \
+ !empty(PKG_OPTIONS.openldap:Msasl)
. include "../../security/cyrus-sasl2/buildlink3.mk"
.endif
.include "../../security/openssl/buildlink3.mk"