diff options
| author | jlam <jlam@pkgsrc.org> | 2004-03-14 18:57:04 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-03-14 18:57:04 +0000 |
| commit | 86bb0a15b8a6df0bf74643428f613ca36be52671 (patch) | |
| tree | 68d130e3fbe0536c711e8523802a1edcdbdc9200 /mk | |
| parent | b09aacadfa82e348fece75bd02467bb8967e3207 (diff) | |
| download | pkgsrc-86bb0a15b8a6df0bf74643428f613ca36be52671.tar.gz | |
Don't bother checking whether a package is actually built-in or not
in the fall-through code for setting a default value for USE_BUILTIN.<pkg>.
This provides ensures that USE_BUILTIN.<pkg> is always set for every
package listed in BUILDLINK_PACKAGES. Back out previous as it's now
unneeded.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index e3757925617..4de60bdcd58 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.116 2004/03/14 12:15:19 jmmv Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.117 2004/03/14 18:57:04 jlam Exp $ # # An example package buildlink3.mk file: # @@ -102,14 +102,20 @@ PREFER.${_pkg_}= pkgsrc . if ${PREFER.${_pkg_}} == "pkgsrc" USE_BUILTIN.${_pkg_}?= no . endif +# +# builtin.mk files default to using the built-in software if it's +# available (${PREFER.<pkg>} == "native") unless USE_BUILTIN.<pkg> has +# been previously set. +# . if defined(BUILDLINK_PKGSRCDIR.${_pkg_}) . if exists(${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk) . include "${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk" . endif . endif -. if !defined(IS_BUILTIN.${_pkg_}) +# +# Default fall-through for packages that don't provide a builtin.mk. +# USE_BUILTIN.${_pkg_}?= no -. endif .endfor # Set IGNORE_PKG.<pkg> if <pkg> is the current package we're building. @@ -141,7 +147,7 @@ _BLNK_PACKAGES+= ${_pkg_} _BLNK_RECURSIVE_DEPENDS= # empty .for _pkg_ in ${_BLNK_PACKAGES} . if empty(_BLNK_RECURSIVE_DEPENDS:M${_pkg_}) && \ - (defined(USE_BUILTIN.${_pkg_}) && !empty(USE_BUILTIN.${_pkg_}:M[nN][oO])) + !empty(USE_BUILTIN.${_pkg_}:M[nN][oO])) _BLNK_RECURSIVE_DEPENDS+= ${_pkg_} . endif .endfor |