pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Reset MAKELEVEL=0 to fix bad gmake/bsdmake interact...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c4054bb34bfd
branches: trunk
changeset: 621744:c4054bb34bfd
user: christos <christos%pkgsrc.org@localhost>
date: Mon Jul 15 20:22:15 2013 +0000
description:
Reset MAKELEVEL=0 to fix bad gmake/bsdmake interactions.
Our make(1) now sets $MAKELEVEL. While this should cause no harm, gmake
detects a non-zero $MAKELEVEL and automatically sets "w" in $MAKEFLAGS
for subordinate makes, in order to print the entry and exit directories.
Our make, does not understand -w, so it prints an error message and exits.
In order to catch this everywhere (since cmake for example can invoke
either our make or gmake depending on how it feels), we reset the variable
for any top level command. This effectively reverts to the behavior of
our make not setting $MAKELEVEL.
diffstat:
mk/bsd.pkg.mk | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diffs (17 lines):
diff -r dedac066e8f7 -r c4054bb34bfd mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Mon Jul 15 19:55:31 2013 +0000
+++ b/mk/bsd.pkg.mk Mon Jul 15 20:22:15 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1992 2013/06/05 08:19:57 tron Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1993 2013/07/15 20:22:15 christos Exp $
#
# This file is in the public domain.
#
@@ -180,6 +180,7 @@
ALL_ENV+= LINKER_RPATH_FLAG=${LINKER_RPATH_FLAG:Q}
ALL_ENV+= PATH=${PATH:Q}:${LOCALBASE}/bin:${X11BASE}/bin
ALL_ENV+= PREFIX=${PREFIX}
+ALL_ENV+= MAKELEVEL=0
# This variable can be added to MAKE_ENV to ease installation of packages
# that use BSD-style Makefiles.
Home |
Main Index |
Thread Index |
Old Index