diff options
| author | jlam <jlam> | 2005-06-03 20:22:59 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-06-03 20:22:59 +0000 |
| commit | 939b176831a05274f745d8f4757d26ab55840ab6 (patch) | |
| tree | e5378c2c936db7581465a39a24dace9160589a01 | |
| parent | ce1f610bb95e240b7e5fbb40cd147fcfc09f6e41 (diff) | |
| download | pkgsrc-939b176831a05274f745d8f4757d26ab55840ab6.tar.gz | |
Back out revision 1.1684. MAKEFLAGS was being propagated incorrectly
through to dependencies, which caused dependencies to have improper
lists of tools required.
XXX This whole mess with MAKEFLAGS and which ones are passed along when
XXX running the install-depends target needs to be fixed for real.
| -rw-r--r-- | mk/bsd.pkg.mk | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 6f7a2bd883f..88fad21a485 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1685 2005/06/01 18:03:05 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1686 2005/06/03 20:22:59 jlam Exp $ # # This file is in the public domain. # @@ -4832,19 +4832,6 @@ ${_MAKEVARS_MK.${_phase_}}: ${WRKDIR} .endfor .undef _phase_ -# *.makevars.mk doesn't exist until after ${WRKDIR} is created, which -# doesn't happen until after the package is extracted. Prior to -# extraction, cache the variables named in MAKEVARS using MAKEFLAGS -# instead. -# -.if !exists(${EXTRACT_COOKIE}) -. for _var_ in ${MAKEVARS:O:u} -. if defined(${_var_}) -MAKEFLAGS+= ${_var_}=${${_var_}:Q} -. endif -. endfor -.endif - # show-tools emits a /bin/sh shell script that defines all known tools # to the values they have in the pkgsrc infrastructure. # |