summaryrefslogtreecommitdiff
path: root/devel/apr
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 /devel/apr
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 'devel/apr')
-rw-r--r--devel/apr/buildlink3.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/devel/apr/buildlink3.mk b/devel/apr/buildlink3.mk
index 0859d8a7f01..d7c6bc0159d 100644
--- a/devel/apr/buildlink3.mk
+++ b/devel/apr/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2005/02/13 00:51:13 grant Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2005/05/08 12:03:56 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
APR_BUILDLINK3_MK:= ${APR_BUILDLINK3_MK}+
@@ -24,7 +24,12 @@ BUILDLINK_FILES.apr+= bin/apu-config
BUILDLINK_FILES.apr+= lib/*.exp
.endif # APR_BUILDLINK3_MK
-PKG_OPTIONS.apr?= ${PKG_DEFAULT_OPTIONS}
+.if !defined(PKG_OPTIONS.apr)
+PKG_OPTIONS.apr!= cd ${BUILDLINK_PKGSRCDIR.apr} && \
+ ${MAKE} show-var ${MAKE_FLAGS} VARNAME=PKG_OPTIONS
+MAKE_FLAGS+= PKG_OPTIONS.apr=${PKG_OPTIONS.apr:Q}
+WRAPPER_VARS+= PKG_OPTIONS.apr
+.endif
.if !empty(PKG_OPTIONS.apr:Mdb4)
. include "../../databases/db4/buildlink3.mk"