summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-06-03 20:22:59 +0000
committerjlam <jlam@pkgsrc.org>2005-06-03 20:22:59 +0000
commita741f4ed2660b46c280ddd35cf85ed8112ce1ac1 (patch)
treee5378c2c936db7581465a39a24dace9160589a01 /mk
parentdf23a5c3765cd7222b153ef78b8303e828549e77 (diff)
downloadpkgsrc-a741f4ed2660b46c280ddd35cf85ed8112ce1ac1.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.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk15
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.
#