summaryrefslogtreecommitdiff
path: root/misc
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 /misc
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 'misc')
-rw-r--r--misc/kdepim3/buildlink3.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/misc/kdepim3/buildlink3.mk b/misc/kdepim3/buildlink3.mk
index 0518ef87935..f510dda5766 100644
--- a/misc/kdepim3/buildlink3.mk
+++ b/misc/kdepim3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/03/28 09:39:57 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2005/05/08 12:03:56 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
KDEPIM_BUILDLINK3_MK:= ${KDEPIM_BUILDLINK3_MK}+
@@ -16,7 +16,13 @@ BUILDLINK_RECOMMENDED.kdepim+= kdepim>=3.4.0
BUILDLINK_PKGSRCDIR.kdepim?= ../../misc/kdepim3
.endif # KDEPIM_BUILDLINK3_MK
-PKG_OPTIONS.kdepim?= ${PKG_DEFAULT_OPTIONS}
+.if !defined(PKG_OPTIONS.kdepim)
+PKG_OPTIONS.kdepim!= \
+ cd ${BUILDLINK_PKGSRCDIR.kdepim} && \
+ ${MAKE} show-var ${MAKE_FLAGS} VARNAME=PKG_OPTIONS
+MAKE_FLAGS+= PKG_OPTIONS.kdepim=${PKG_OPTIONS.kdepim:Q}
+WRAPPER_VARS+= PKG_OPTIONS.kdepim
+.endif
.include "../../comms/libmal/buildlink3.mk"
.include "../../comms/pilot-link-libs/buildlink3.mk"