diff options
author | jlam <jlam@pkgsrc.org> | 2003-08-27 01:47:32 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2003-08-27 01:47:32 +0000 |
commit | a321f021a48faacfa62f4a70bcaf5f32e7125a3c (patch) | |
tree | c8a0e510e99c6263ba220ce6e0d9b22d5db0fc39 | |
parent | 0c78d45882e63da730681df63bb290b2089296fa (diff) | |
download | pkgsrc-a321f021a48faacfa62f4a70bcaf5f32e7125a3c.tar.gz |
Some speed optimizations so that we don't keep evaluating some variables
set via != for every sub-make process.
-rw-r--r-- | mk/bsd.pkg.mk | 21 | ||||
-rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 25 |
2 files changed, 29 insertions, 17 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 1b344a188e0..4eb308bb821 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1216.2.37 2003/08/27 00:59:41 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1216.2.38 2003/08/27 01:47:32 jlam Exp $ # # This file is in the public domain. # @@ -115,14 +115,6 @@ PKG_FAIL_REASON+= "PLIST_TYPE must be \`\`dynamic'' or \`\`static''." PKG_FAIL_REASON+= "PLIST_TYPE must be \`\`static'' for \`\`overwrite'' packages." .endif -# Set the default BUILDLINK_DIR, BUILDLINK_X11PKG_DIR, BUILDLINK_X11_DIR so -# that if no buildlink2.mk files are included, then they still point to -# where headers and libraries for installed packages and X11R6 may be found. -# -BUILDLINK_DIR?= ${LOCALBASE} -BUILDLINK_X11PKG_DIR?= ${X11BASE} -BUILDLINK_X11_DIR?= ${X11BASE} - USE_BUILDLINK2?= no # default to not using buildlink2 .if ${PKG_INSTALLATION_TYPE} == "pkgviews" _USE_BUILDLINK3= yes # pkgviews requires buildlink3 @@ -133,6 +125,17 @@ _USE_BUILDLINK3= no PKG_FAIL_REASON+= "Please undefine USE_BUILDLINK2 when using pkgviews." .endif +.if empty(_USE_BUILDLINK3:M[yY][eE][sS]) +# +# Set the default BUILDLINK_DIR, BUILDLINK_X11PKG_DIR, BUILDLINK_X11_DIR so +# that if no buildlink2.mk files are included, then they still point to +# where headers and libraries for installed packages and X11R6 may be found. +# +BUILDLINK_DIR?= ${LOCALBASE} +BUILDLINK_X11PKG_DIR?= ${X11BASE} +BUILDLINK_X11_DIR?= ${X11BASE} +.endif + .if defined(USE_IMAKE) USE_X11BASE?= implied PLIST_SUBST+= IMAKE_MAN_SOURCE_PATH=${IMAKE_MAN_SOURCE_PATH} \ diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 627330cdded..8a36c3764c6 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.1.2.19 2003/08/26 20:56:38 jlam Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.1.2.20 2003/08/27 01:47:34 jlam Exp $ # # An example package buildlink3.mk file: # @@ -47,13 +47,19 @@ BUILDLINK_DEPENDS.x11-links= x11-links>=0.13 BUILDLINK_DEPMETHOD.x11-links= build BUILDLINK_PKGSRCDIR.x11-links= ../../pkgtools/x11-links +. if !defined(BUILDLINK_X11_DIR) BUILDLINK_X11_DIR!= \ cd ${_PKG_DBDIR}; \ dir=`${PKG_ADMIN} -s "" lsbest "${BUILDLINK_DEPENDS.x11-links}" || ${TRUE}`; \ case "$$dir" in \ - "") ${ECHO} "not_found" ;; \ - *) ${ECHO} "$$dir/${X11_LINKS_SUBDIR}" ;; \ - esac + "") dir="not_found" ;; \ + *) dir="$$dir/${X11_LINKS_SUBDIR}" ;; \ + esac; \ + ${ECHO} $$dir +. if empty(BUILDLINK_X11_DIR:Mnot_found) +MAKEFLAGS+= BUILDLINK_X11_DIR=${BUILDLINK_X11_DIR} +. endif +. endif .endif .for _pkg_ in ${BUILDLINK_DEPENDS} @@ -101,14 +107,17 @@ ${_BLNK_DEPMETHOD.${_pkg_}}+= \ . if !defined(BUILDLINK_PKGBASE.${_pkg_}) BUILDLINK_PKGBASE.${_pkg_}?= ${_pkg_} . endif -. if !defined(BUILDLINK_PREFIX.${_pkg_}) +. if !defined(BUILDLINK_DEPOT.${_pkg_}) BUILDLINK_DEPOT.${_pkg_}!= \ cd ${_PKG_DBDIR}; \ dir=`${PKG_ADMIN} -s "" lsbest "${BUILDLINK_DEPENDS.${_pkg_}}" || ${TRUE}`; \ case "$$dir" in \ - "") ${ECHO} "not_found" ;; \ - *) ${ECHO} "$$dir" ;; \ - esac + "") dir="not_found" ;; \ + esac; \ + ${ECHO} $$dir +. if empty(BUILDLINK_DEPOT.${_pkg_}:Mnot_found) +MAKEFLAGS+= BUILDLINK_DEPOT.${_pkg_}=${BUILDLINK_DEPOT.${_pkg_}} +. endif . endif . if !defined(BUILDLINK_PREFIX.${_pkg_}) BUILDLINK_PREFIX.${_pkg_}?= ${BUILDLINK_DEPOT.${_pkg_}} |