diff options
-rw-r--r-- | databases/openldap/buildlink3.mk | 6 | ||||
-rw-r--r-- | devel/apr/buildlink3.mk | 4 | ||||
-rw-r--r-- | misc/kdepim3/buildlink3.mk | 8 | ||||
-rw-r--r-- | mk/bsd.pkg.mk | 79 | ||||
-rw-r--r-- | mk/bsd.prefs.mk | 3 | ||||
-rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 16 | ||||
-rw-r--r-- | mk/wrapper/bsd.wrapper.mk | 32 | ||||
-rw-r--r-- | security/heimdal/buildlink3.mk | 6 | ||||
-rw-r--r-- | security/openssl/buildlink3.mk | 6 | ||||
-rw-r--r-- | x11/kdebase3/buildlink3.mk | 6 | ||||
-rw-r--r-- | x11/kdelibs3/buildlink3.mk | 6 |
11 files changed, 98 insertions, 74 deletions
diff --git a/databases/openldap/buildlink3.mk b/databases/openldap/buildlink3.mk index ee6a588373b..b6fd1e810b3 100644 --- a/databases/openldap/buildlink3.mk +++ b/databases/openldap/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2005/05/08 12:03:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2005/05/09 05:06:55 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENLDAP_BUILDLINK3_MK:= ${OPENLDAP_BUILDLINK3_MK}+ @@ -22,9 +22,9 @@ BUILDLINK_PKGSRCDIR.openldap?= ../../databases/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 +MAKE_FLAGS+= PKG_OPTIONS.openldap=${PKG_OPTIONS.openldap:Q} .endif +MAKE_VARS+= PKG_OPTIONS.openldap .if !empty(PKG_OPTIONS.openldap:Mkerberos) || \ !empty(PKG_OPTIONS.openldap:Msasl) diff --git a/devel/apr/buildlink3.mk b/devel/apr/buildlink3.mk index d7c6bc0159d..1aa0e7abbdd 100644 --- a/devel/apr/buildlink3.mk +++ b/devel/apr/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2005/05/08 12:03:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2005/05/09 05:06:55 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ APR_BUILDLINK3_MK:= ${APR_BUILDLINK3_MK}+ @@ -28,8 +28,8 @@ BUILDLINK_FILES.apr+= lib/*.exp 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 +MAKE_VARS+= PKG_OPTIONS.apr .if !empty(PKG_OPTIONS.apr:Mdb4) . include "../../databases/db4/buildlink3.mk" diff --git a/misc/kdepim3/buildlink3.mk b/misc/kdepim3/buildlink3.mk index f510dda5766..8afbdf8bbca 100644 --- a/misc/kdepim3/buildlink3.mk +++ b/misc/kdepim3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2005/05/08 12:03:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2005/05/09 05:06:56 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ KDEPIM_BUILDLINK3_MK:= ${KDEPIM_BUILDLINK3_MK}+ @@ -20,9 +20,9 @@ BUILDLINK_PKGSRCDIR.kdepim?= ../../misc/kdepim3 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 +MAKE_FLAGS+= PKG_OPTIONS.kdepim=${PKG_OPTIONS.kdepim:Q} .endif +MAKE_VARS+= PKG_OPTIONS.kdepim .include "../../comms/libmal/buildlink3.mk" .include "../../comms/pilot-link-libs/buildlink3.mk" @@ -33,4 +33,4 @@ WRAPPER_VARS+= PKG_OPTIONS.kdepim .include "../../x11/kdebase3/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 2a26dbb8d49..f4d26c2635d 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1630 2005/05/08 13:52:25 dillo Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1631 2005/05/09 05:06:55 jlam Exp $ # # This file is in the public domain. # @@ -21,6 +21,27 @@ .include "../../mk/bsd.prefs.mk" .include "../../mk/bsd.hacks.mk" +.if !defined(_REV_ALL_PHASES) +_REV_ALL_PHASES= # empty +. for _phase_ in ${ALL_PHASES} +_REV_ALL_PHASES:= ${_phase_} ${_REV_ALL_PHASES} +. endfor +. undef _phase_ +.endif +MAKE_VARS+= _REV_ALL_PHASES + +# Try including the .makevars.mk.* files in reverse order so that the +# latest file is included and no more. +# +.for _phase_ in ${_REV_ALL_PHASES} +_MAKE_VARS_MK.${_phase_}= ${WRKDIR}/.${_phase_}_makevars.mk +${_phase_}-vars: ${_MAKE_VARS_MK.${_phase_}} +. if !defined(_MAKE_VARS_MK) +. sinclude "${_MAKE_VARS_MK.${_phase_}}" +. endif +.endfor +.undef _phase_ + # This has to come first to avoid showing all BUILD_DEFS added by this # Makefile, which are usually not customizable. .PHONY: pre-install-depends build-defs-message @@ -3161,12 +3182,12 @@ test-cookie: ${_PKG_SILENT}${_PKG_DEBUG} ${TOUCH} ${TOUCH_FLAGS} ${TEST_COOKIE} .ORDER: pre-fetch do-fetch post-fetch -.ORDER: extract-message install-depends pre-extract do-extract post-extract extract-cookie -.ORDER: patch-message pre-patch do-patch post-patch patch-cookie -.ORDER: tools-message pre-tools do-tools post-tools tools-cookie -.ORDER: wrapper-message pre-wrapper do-wrapper post-wrapper wrapper-cookie -.ORDER: configure-message pre-configure pre-configure-override do-configure post-configure configure-cookie -.ORDER: build-message pre-build do-build post-build build-cookie +.ORDER: extract-message extract-vars install-depends pre-extract do-extract post-extract extract-cookie +.ORDER: patch-message patch-vars pre-patch do-patch post-patch patch-cookie +.ORDER: tools-message tools-vars pre-tools do-tools post-tools tools-cookie +.ORDER: wrapper-message wrapper-vars pre-wrapper do-wrapper post-wrapper wrapper-cookie +.ORDER: configure-message configure-vars pre-configure pre-configure-override do-configure post-configure configure-cookie +.ORDER: build-message build-vars pre-build do-build post-build build-cookie .ORDER: test-message pre-test do-test post-test test-cookie # Please note that the order of the following targets is important, and @@ -3177,15 +3198,15 @@ test-cookie: .PHONY: real-configure real-build real-test real-install real-package .PHONY: real-replace real-undo-replace real-fetch: pre-fetch do-fetch post-fetch -real-extract: extract-message install-depends pre-extract do-extract post-extract extract-cookie -real-patch: patch-message pre-patch do-patch post-patch patch-cookie -real-tools: tools-message pre-tools do-tools post-tools tools-cookie -real-wrapper: wrapper-message pre-wrapper do-wrapper post-wrapper wrapper-cookie -real-configure: configure-message pre-configure pre-configure-override do-configure post-configure configure-cookie -real-build: build-message pre-build do-build post-build build-cookie +real-extract: extract-message extract-vars install-depends pre-extract do-extract post-extract extract-cookie +real-patch: patch-message patch-vars pre-patch do-patch post-patch patch-cookie +real-tools: tools-message tools-vars pre-tools do-tools post-tools tools-cookie +real-wrapper: wrapper-message wrapper-vars pre-wrapper do-wrapper post-wrapper wrapper-cookie +real-configure: configure-message configure-vars pre-configure pre-configure-override do-configure post-configure configure-cookie +real-build: build-message build-vars pre-build do-build post-build build-cookie real-test: test-message pre-test do-test post-test test-cookie -real-install: do-su-install -real-package: do-su-package +real-install: install-vars do-su-install +real-package: package-vars do-su-package real-replace: do-su-replace real-undo-replace: do-su-undo-replace @@ -5128,3 +5149,31 @@ PKG_ERROR_HANDLER.${_class_}?= { \ exit $$ec; \ } .endfor + +# Cache variables listed in MAKE_VARS in a phase-specific "makevars.mk" +# file. These variables are effectively passed to sub-make processes +# that are invoked on the same Makefile. +# +.for _phase_ in ${ALL_PHASES} +${_MAKE_VARS_MK.${_phase_}}: ${WRKDIR} +. if !empty(PKG_PHASE:M${_phase_}) + ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET}.tmp +. for _var_ in ${MAKE_VARS:O:u} + ${_PKG_SILENT}${_PKG_DEBUG} \ + ${ECHO} ${_var_}"= "${${_var_}:Q} >> ${.TARGET}.tmp +. endfor + ${_PKG_SILENT}${_PKG_DEBUG} \ + if ${TEST} -f ${.TARGET}.tmp; then \ + ( ${ECHO} ".if !defined(_MAKE_VARS_MK)"; \ + ${ECHO} "_MAKE_VARS_MK= defined"; \ + ${ECHO} ""; \ + ${CAT} ${.TARGET}.tmp; \ + ${ECHO} ""; \ + ${ECHO} ".endif # _MAKE_VARS_MK"; \ + ) > ${.TARGET}; \ + ${RM} -f ${.TARGET}.tmp; \ + fi +. endif + ${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_FLAGS} ${.TARGET} +.endfor +.undef _phase_ diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 0744a9c8ae9..d99e159b4f9 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.188 2005/05/02 21:10:02 jlam Exp $ +# $NetBSD: bsd.prefs.mk,v 1.189 2005/05/09 05:06:55 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -324,6 +324,7 @@ PKG_PHASE?= none # The PHASES_AFTER_<phase> variables list every phase "greater than or # equal to" <phase>. # +ALL_PHASES= ${PHASES_AFTER_FETCH} PHASES_AFTER_FETCH= fetch ${PHASES_AFTER_EXTRACT} PHASES_AFTER_EXTRACT= extract ${PHASES_AFTER_PATCH} PHASES_AFTER_PATCH= patch ${PHASES_AFTER_TOOLS} diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 283c9ac1c27..4d47c72ea5b 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.168 2005/02/17 12:15:44 seb Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.169 2005/05/09 05:06:55 jlam Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -313,9 +313,9 @@ _BLNK_PKG_DBDIR.${_pkg_}!= \ ${ECHO} $$dir . endif . endfor -. if empty(_BLNK_PKG_DBDIR.${_pkg_}:M*not_found) -WRAPPER_VARS+= _BLNK_PKG_DBDIR.${_pkg_} -. endif +. endif +. if empty(_BLNK_PKG_DBDIR.${_pkg_}:M*not_found) +MAKE_VARS+= _BLNK_PKG_DBDIR.${_pkg_} . endif . if empty(_BLNK_PKG_DBDIR.${_pkg_}:M*not_found) @@ -344,9 +344,9 @@ BUILDLINK_PREFIX.${_pkg_}!= \ BUILDLINK_PREFIX.${_pkg_}= BUILDLINK_PREFIX.${_pkg_}_not_found . endif . endif -. if empty(BUILDLINK_PREFIX.${_pkg_}:M*not_found) -WRAPPER_VARS+= BUILDLINK_PREFIX.${_pkg_} -. endif +. endif +. if empty(BUILDLINK_PREFIX.${_pkg_}:M*not_found) +MAKE_VARS+= BUILDLINK_PREFIX.${_pkg_} . endif BUILDLINK_AUTO_VARS.${_pkg_}?= yes @@ -865,8 +865,8 @@ _BLNK_PHYSICAL_PATH.${_var_}!= \ else \ ${ECHO} ${${_var_}}; \ fi -WRAPPER_VARS+= _BLNK_PHYSICAL_PATH.${_var_} . endif +MAKE_VARS+= _BLNK_PHYSICAL_PATH.${_var_} .endfor # Transform all references to the physical paths to some important diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk index 83487b94157..bbcb337b72e 100644 --- a/mk/wrapper/bsd.wrapper.mk +++ b/mk/wrapper/bsd.wrapper.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.wrapper.mk,v 1.28 2005/04/07 16:56:00 tv Exp $ +# $NetBSD: bsd.wrapper.mk,v 1.29 2005/05/09 05:06:56 jlam Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -44,21 +44,11 @@ ECHO_WRAPPER_MSG?= ${ECHO} .else ECHO_WRAPPER_MSG?= ${TRUE} .endif -_WRAP_VARS_MK= ${WRAPPER_DIR}/vars.mk - -.if exists(${_WRAP_VARS_MK}) -. include "${_WRAP_VARS_MK}" -.endif .PHONY: do-wrapper .include "../../mk/buildlink3/bsd.buildlink3.mk" -# Create the saved variables Makefile fragment to pass variables -# through to sub-make processes invoked on the same Makefile. -# -do-wrapper: ${_WRAP_VARS_MK} - # Prepend ${WRAPPER_BINDIR} to the PATH so that the wrappers are found # first when searching for executables. # @@ -111,9 +101,9 @@ _WRAP_TRANSFORM_CMDS+= ${WRAPPER_TRANSFORM_CMDS} # are already being called with the correct arguments. # .if !defined(_WRAP_PATH) -_WRAP_PATH= ${PATH:S/${WRAPPER_BINDIR}://:S/:${WRAPPER_BINDIR}//} -WRAPPER_VARS+= _WRAP_PATH +_WRAP_PATH= ${PATH:S/${WRAPPER_BINDIR}://:S/:${WRAPPER_BINDIR}//} .endif +MAKE_VARS+= _WRAP_PATH # Generate wrapper scripts for the compiler tools. These wrapper # scripts are to be used instead of the actual compiler tools when @@ -697,22 +687,6 @@ ${_WRAP_SCAN.${_wrappee_}}: ${WRAPPER_SRCDIR}/scan . endif .endfor # _WRAPPEES -.if !target(${_WRAP_VARS_MK}) -${_WRAP_VARS_MK}: - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} - ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET}.tmp -. for _var_ in ${WRAPPER_VARS} - ${_PKG_SILENT}${_PKG_DEBUG} \ - ${ECHO} "${_var_}= ${${_var_}}" >> ${.TARGET}.tmp -. endfor - ${_PKG_SILENT}${_PKG_DEBUG} \ - if [ -f ${.TARGET}.tmp ]; then \ - ${SORT} -u ${.TARGET}.tmp > ${.TARGET}; \ - ${RM} -f ${.TARGET}.tmp; \ - fi - ${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_FLAGS} ${.TARGET} -.endif - # UNWRAP_PATTERNS and UNWRAP_FILES list shell globs and files relative to # ${WRKSRC} that need to be "unwrapped". # diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk index 1f403d63e99..7b7b10f720e 100644 --- a/security/heimdal/buildlink3.mk +++ b/security/heimdal/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2005/05/08 12:03:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2005/05/09 05:06:56 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ HEIMDAL_BUILDLINK3_MK:= ${HEIMDAL_BUILDLINK3_MK}+ @@ -23,9 +23,9 @@ BUILDLINK_INCDIRS.heimdal?= include/krb5 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 +MAKE_FLAGS+= PKG_OPTIONS.heimdal=${PKG_OPTIONS.heimdal:Q} .endif +MAKE_VARS+= PKG_OPTIONS.heimdal .include "../../security/openssl/buildlink3.mk" .if !empty(PKG_OPTIONS.heimdal:Mdb4) diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk index 55e9e012f92..ca23f243a2c 100644 --- a/security/openssl/buildlink3.mk +++ b/security/openssl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2005/05/08 12:03:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2005/05/09 05:06:56 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OPENSSL_BUILDLINK3_MK:= ${OPENSSL_BUILDLINK3_MK}+ @@ -30,9 +30,9 @@ BUILD_DEFS+= SSLBASE 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 +MAKE_FLAGS+= PKG_OPTIONS.openssl=${PKG_OPTIONS.openssl:Q} .endif +MAKE_VARS+= PKG_OPTIONS.openssl .if !empty(PKG_OPTIONS.openssl:Mrsaref) . include "../../security/rsaref/buildlink3.mk" diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk index a9c69eca04e..ba9c13c5266 100644 --- a/x11/kdebase3/buildlink3.mk +++ b/x11/kdebase3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2005/05/08 12:03:56 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2005/05/09 05:06:56 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ KDEBASE_BUILDLINK3_MK:= ${KDEBASE_BUILDLINK3_MK}+ @@ -20,9 +20,9 @@ BUILDLINK_PKGSRCDIR.kdebase?= ../../x11/kdebase3 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 +MAKE_FLAGS+= PKG_OPTIONS.kdebase=${PKG_OPTIONS.kdebase:Q} .endif +MAKE_VARS+= PKG_OPTIONS.kdebase BUILDLINK_DEPENDS.Xrandr+= Xrandr>=1.0 diff --git a/x11/kdelibs3/buildlink3.mk b/x11/kdelibs3/buildlink3.mk index 8fd57cb315e..90cb329686c 100644 --- a/x11/kdelibs3/buildlink3.mk +++ b/x11/kdelibs3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2005/05/08 12:03:57 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2005/05/09 05:06:56 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ KDELIBS_BUILDLINK3_MK:= ${KDELIBS_BUILDLINK3_MK}+ @@ -24,9 +24,9 @@ BUILDLINK_PKGSRCDIR.kdelibs?= ../../x11/kdelibs3 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 +MAKE_FLAGS+= PKG_OPTIONS.kdelibs=${PKG_OPTIONS.kdelibs:Q} .endif +MAKE_VARS+= PKG_OPTIONS.kdelibs .if !empty(PKG_OPTIONS.kdelibs:Mcups) . include "../../print/cups/buildlink3.mk" |