diff options
| author | dholland <dholland> | 2013-06-08 20:23:02 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2013-06-08 20:23:02 +0000 |
| commit | 8ab44f75a3ed454c4068742b77bb28afe3744b8a (patch) | |
| tree | 0558c032921dffeb0729d5757e35415813d6fdb7 /mk | |
| parent | 974cf1363502e49d2928e0f8eb8d13fc4b9ee7bd (diff) | |
| download | pkgsrc-8ab44f75a3ed454c4068742b77bb28afe3744b8a.tar.gz | |
Add two additional hacks/workarounds to make netbsd-5's make accept the
USE_BUILTIN checking loop.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 1287a80b99a..19511f8cce1 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.222 2013/06/07 17:15:54 dholland Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.223 2013/06/08 20:23:02 dholland Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -131,8 +131,10 @@ _ok_:=yes .for _pkg_ in ${BUILDLINK_TREE} # work around PR 47888 _enter_:=${_pkg_:M-*} +# work around another bug in netbsd-5's make (fixed in HEAD) +_use_:=${USE_BUILTIN.${_pkg_:S/^-//}:M[Yy][Ee][Ss]} -. if ${_pkg_} == x11-links || ${_pkg_} == -x11-links +. if "${_pkg_}" == "x11-links" || "${_pkg_}" == "-x11-links" # (nothing) . elif empty(_enter_) # entering a package (in the buildlink tree) @@ -141,7 +143,7 @@ _enter_:=${_pkg_:M-*} _ok_:=yes . else # leaving a package (in the buildlink tree) -. if !empty(USE_BUILTIN.${_pkg_:S/^-//}:M[Yy][Ee][Ss]) +. if !empty(_use_) # this package is going to use the builtin version . if ${_ok_} == no # not ok for it to be builtin; force it to pkgsrc |