diff options
| author | obache <obache@pkgsrc.org> | 2014-04-17 01:57:31 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2014-04-17 01:57:31 +0000 |
| commit | 622f1ee853e9031cbacb172a6127eb0478f9547f (patch) | |
| tree | b3876d99c65e73a62699e684a6cc8f528fb84081 /mk | |
| parent | 01e510a7b432a2388c80ea9d1f2a3d5d40993857 (diff) | |
| download | pkgsrc-622f1ee853e9031cbacb172a6127eb0478f9547f.tar.gz | |
Stop USE_BUINTIN.pkg=no escalation from IGNORE_PKG.pkg=YES.
affect to result of pkgtools/x11-links, normal build v.s. pbulk.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 0f90aca58f8..13caee2821a 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.224 2014/03/10 12:06:35 jperkin Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.225 2014/04/17 01:57:31 obache Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -133,6 +133,7 @@ _ok_:=yes _enter_:=${_pkg_:M-*} # work around another bug in netbsd-5's make (fixed in HEAD) _use_:=${USE_BUILTIN.${_pkg_:S/^-//}:M[Yy][Ee][Ss]} +_ignore_:=${IGNORE_PKG.${_pkg_:S/^-//}:M[Yy][Ee][Ss]} . if "${_pkg_}" == "x11-links" || "${_pkg_}" == "-x11-links" # (nothing) @@ -153,7 +154,7 @@ _use_:=${USE_BUILTIN.${_pkg_:S/^-//}:M[Yy][Ee][Ss]} . else #.say "${_stack_:C/.*/ /} ${_pkg_:S/^-//} built-in" . endif -. else +. elif empty(_ignore_) # no builtin version or not using it #.say "${_stack_:C/.*/ /} ${_pkg_:S/^-//} pkgsrc" _ok_:=no |