pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Avoid circular dependencies if USE_GNU_TOOLS is set...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d2f5db069330
branches: trunk
changeset: 460053:d2f5db069330
user: jlam <jlam%pkgsrc.org@localhost>
date: Sun Aug 17 04:06:36 2003 +0000
description:
Avoid circular dependencies if USE_GNU_TOOLS is set unconditionally in
either the environment or in /etc/mk.conf by telling dependencies of the
named GNU tool to ignore any USE_GNU_TOOLS settings when they are built.
diffstat:
mk/tools.mk | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diffs (55 lines):
diff -r 684a17dcd773 -r d2f5db069330 mk/tools.mk
--- a/mk/tools.mk Sun Aug 17 04:02:17 2003 +0000
+++ b/mk/tools.mk Sun Aug 17 04:06:36 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.mk,v 1.8 2003/08/17 02:03:53 jlam Exp $
+# $NetBSD: tools.mk,v 1.9 2003/08/17 04:06:36 jlam Exp $
#
# This Makefile creates a ${TOOLS_DIR} directory and populates the bin
# subdir with tools that hide the ones outside of ${TOOLS_DIR}.
@@ -115,6 +115,12 @@
_TOOLS= awk grep sed
+.if defined(_IGNORE_USE_GNU_TOOLS)
+USE_GNU_TOOLS:= # empty
+.else
+USE_GNU_TOOLS?= # empty
+.endif
+
# These platforms already have GNU versions of the tools in the base
# system, so no need to pull in the pkgsrc versions; we will use these
# instead.
@@ -188,6 +194,10 @@
_TOOLS_PROGNAME.awk= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}awk
AWK:= ${_TOOLS_PROGNAME.awk}
.endif
+.if !empty(PKGPATH:Mlang/gawk)
+_TOOLS_OVERRIDE.awk= NO
+MAKEFLAGS+= _IGNORE_USE_GNU_TOOLS=
+.endif
.if ${_TOOLS_REPLACE.grep} == "YES"
_TOOLS_OVERRIDE.grep= YES
@@ -199,6 +209,10 @@
_TOOLS_PROGNAME.grep= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}grep
GREP:= ${_TOOLS_PROGNAME.grep}
.endif
+.if !empty(PKGPATH:Mtextproc/grep)
+_TOOLS_OVERRIDE.grep= NO
+MAKEFLAGS+= _IGNORE_USE_GNU_TOOLS=
+.endif
.if ${_TOOLS_REPLACE.sed} == "YES"
_TOOLS_OVERRIDE.sed= YES
@@ -210,6 +224,10 @@
_TOOLS_PROGNAME.sed= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}sed
SED:= ${_TOOLS_PROGNAME.sed}
.endif
+.if !empty(PKGPATH:Mtextproc/gsed)
+_TOOLS_OVERRIDE.sed= NO
+MAKEFLAGS+= _IGNORE_USE_GNU_TOOLS=
+.endif
# If _TOOLS_OVERRIDE.<tool> is actually set to "YES", then we override
# the tool with the one specified in _TOOLS_PROGNAME.<tool>.
Home |
Main Index |
Thread Index |
Old Index