diff options
| author | jlam <jlam> | 2005-05-08 12:03:56 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-05-08 12:03:56 +0000 |
| commit | b8db6c81fe6cc1841d7279e0dad165ae2d78efbe (patch) | |
| tree | cbe8ca94551b9917f6bdc3e7fdaf4be46b9a187f /x11 | |
| parent | a0674319fe5be5223260ddba49c04744bdb147e7 (diff) | |
| download | pkgsrc-b8db6c81fe6cc1841d7279e0dad165ae2d78efbe.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 'x11')
| -rw-r--r-- | x11/kdebase3/buildlink3.mk | 10 | ||||
| -rw-r--r-- | x11/kdelibs3/buildlink3.mk | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk index 5ddc2a5d7d2..a9c69eca04e 100644 --- a/x11/kdebase3/buildlink3.mk +++ b/x11/kdebase3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2005/03/28 09:39:58 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2005/05/08 12:03:56 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ KDEBASE_BUILDLINK3_MK:= ${KDEBASE_BUILDLINK3_MK}+ @@ -16,7 +16,13 @@ BUILDLINK_RECOMMENDED.kdebase?= kdebase>=3.4.0 BUILDLINK_PKGSRCDIR.kdebase?= ../../x11/kdebase3 .endif # KDEBASE_BUILDLINK3_MK -PKG_OPTIONS.kdebase?= ${PKG_DEFAULT_OPTIONS} +.if !defined(PKG_OPTIONS.kdebase) +PKG_OPTIONS.kdebase!= \ + cd ${BUILDLINK_PKGSRCDIR.kdebase} && \ + ${MAKE} show-var ${MAKE_FLAGS} VARNAME=PKG_OPTIONS +MAKE_FLAGS+= PKG_OPTIONS.kdebase=${PKG_OPTIONS.kdebase:Q} +WRAPPER_VARS+= PKG_OPTIONS.kdebase +.endif BUILDLINK_DEPENDS.Xrandr+= Xrandr>=1.0 diff --git a/x11/kdelibs3/buildlink3.mk b/x11/kdelibs3/buildlink3.mk index e7ba25acc90..8fd57cb315e 100644 --- a/x11/kdelibs3/buildlink3.mk +++ b/x11/kdelibs3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2005/04/13 22:13:53 salo Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2005/05/08 12:03:57 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ KDELIBS_BUILDLINK3_MK:= ${KDELIBS_BUILDLINK3_MK}+ @@ -20,7 +20,13 @@ BUILDLINK_PKGSRCDIR.kdelibs?= ../../x11/kdelibs3 .include "../../x11/kdelibs3/dirs.mk" .endif # KDELIBS_BUILDLINK3_MK -PKG_OPTIONS.kdelibs?= ${PKG_DEFAULT_OPTIONS} +.if !defined(PKG_OPTIONS.kdelibs) +PKG_OPTIONS.kdelibs!= \ + cd ${BUILDLINK_PKGSRCDIR.kdelibs} && \ + ${MAKE} show-var ${MAKE_FLAGS} VARNAME=PKG_OPTIONS +MAKE_FLAGS+= PKG_OPTIONS.kdelibs=${PKG_OPTIONS.kdelibs:Q} +WRAPPER_VARS+= PKG_OPTIONS.kdelibs +.endif .if !empty(PKG_OPTIONS.kdelibs:Mcups) . include "../../print/cups/buildlink3.mk" |