pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Prevent MAKEFLAGS from being passed through shell e...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/46b84c636683
branches:  trunk
changeset: 492091:46b84c636683
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Tue Apr 05 03:18:00 2005 +0000

description:
Prevent MAKEFLAGS from being passed through shell environment.  It was
redundant because we explicitly pass MAKEFLAGS to a sub-process
through command line arguments.

This fixes the problem reported in PR pkg/29874 that PKGNAME_REQD is
not overridden in recursive MAKE calls.

diffstat:

 mk/bsd.pkg.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 8527ca29c909 -r 46b84c636683 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue Apr 05 02:01:52 2005 +0000
+++ b/mk/bsd.pkg.mk     Tue Apr 05 03:18:00 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1606 2005/03/31 21:02:28 agc Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1607 2005/04/05 03:18:00 minskim Exp $
 #
 # This file is in the public domain.
 #
@@ -4029,7 +4029,7 @@
                        ${ECHO_MSG} "=> No directory for $$dir.  Skipping.."; \
                else                                                    \
                        cd $$dir ;                                      \
-                       ${SETENV} _PKGSRC_DEPS=", ${PKGNAME}${_PKGSRC_DEPS}" ${MAKE} ${MAKEFLAGS} $$target PKGNAME_REQD=\'$$pkg\' || exit 1; \
+                       ${SETENV} _PKGSRC_DEPS=", ${PKGNAME}${_PKGSRC_DEPS}" ${MAKE} ${MAKEFLAGS} $$target PKGNAME_REQD=\'$$pkg\' MAKEFLAGS="" || exit 1; \
                        ${ECHO_MSG} "${_PKGSRC_IN}> Returning to build of ${PKGNAME}"; \
                fi;                                                     \
        fi



Home | Main Index | Thread Index | Old Index