[pkgsrc/trunk]: pkgsrc/mk Replace _IGNORE_USE_GNU_TOOLS with finer-grained ex...

[gavan <gavan%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/26ee0d3a9e8c
branches:  trunk
changeset: 488829:26ee0d3a9e8c
user:      gavan <gavan%pkgsrc.org@localhost>
date:      Wed Feb 09 22:10:19 2005 +0000

description:
Replace _IGNORE_USE_GNU_TOOLS with finer-grained exclusion.

This solves the problem of building GNU tools that explicitly or
implicitly depend on other GNU tools. This problem has presented a
bootstrap issue on platforms with few GNU tools, especially where
USE_PKGSRC_GCC is used.

Based on a patch posted by sketch on tech-pkg in December 2003.

diffstat:

 mk/tools.mk |  29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diffs (99 lines):

diff -r 36aaa0b2c1eb -r 26ee0d3a9e8c mk/tools.mk
--- a/mk/tools.mk       Wed Feb 09 21:25:35 2005 +0000
+++ b/mk/tools.mk       Wed Feb 09 22:10:19 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.mk,v 1.50 2005/01/21 02:23:34 tv Exp $
+# $NetBSD: tools.mk,v 1.51 2005/02/09 22:10:19 gavan Exp $
 #
 # This Makefile creates a ${TOOLS_DIR} directory and populates the bin
 # subdir with tools that hide the ones outside of ${TOOLS_DIR}.
@@ -123,10 +123,13 @@
 
 _TOOLS=                awk grep lex m4 make patch sed yacc
 
-.if defined(_IGNORE_USE_GNU_TOOLS)
-USE_GNU_TOOLS:=                # empty
-.else
-USE_GNU_TOOLS?=                # empty
+.if defined(_IGNORE_GNU_TOOL) && defined(USE_GNU_TOOLS)
+.  for _tool_ in ${USE_GNU_TOOLS}
+.    if !defined(_IGNORE_GNU_TOOL.${_tool_})
+_tools+=       ${_tool_}
+.    endif
+.  endfor
+USE_GNU_TOOLS= ${_tools}
 .endif
 
 # These platforms already have GNU versions of the tools in the base
@@ -226,7 +229,7 @@
 .endif
 .if !empty(PKGPATH:Mlang/gawk)
 _TOOLS_OVERRIDE.awk=   NO
-MAKEFLAGS+=            _IGNORE_USE_GNU_TOOLS=
+MAKEFLAGS+=            _IGNORE_GNU_TOOL.awk=
 .endif
 
 .if ${_TOOLS_REPLACE.grep} == "YES"
@@ -243,7 +246,7 @@
 .endif
 .if !empty(PKGPATH:Mtextproc/grep)
 _TOOLS_OVERRIDE.grep=  NO
-MAKEFLAGS+=            _IGNORE_USE_GNU_TOOLS=
+MAKEFLAGS+=            _IGNORE_GNU_TOOL.grep=
 .endif
 
 .if ${_TOOLS_REPLACE.lex} == "YES"
@@ -264,7 +267,7 @@
 .endif
 .if !empty(PKGPATH:Mdevel/flex)
 _TOOLS_OVERRIDE.lex=   NO
-MAKEFLAGS+=            _IGNORE_USE_GNU_TOOLS=
+MAKEFLAGS+=            _IGNORE_GNU_TOOL.lex=
 .endif
 
 .if ${_TOOLS_REPLACE.m4} == "YES"
@@ -281,7 +284,7 @@
 .endif
 .if !empty(PKGPATH:Mdevel/m4)
 _TOOLS_OVERRIDE.m4=    NO
-MAKEFLAGS+=            _IGNORE_USE_GNU_TOOLS=
+MAKEFLAGS+=            _IGNORE_GNU_TOOLS.m4=
 .endif
 
 .if ${_TOOLS_REPLACE.make} == "YES"
@@ -298,7 +301,7 @@
 .endif
 .if !empty(PKGPATH:Mdevel/gmake)
 _TOOLS_OVERRIDE.make=  NO
-MAKEFLAGS+=            _IGNORE_USE_GNU_TOOLS=
+MAKEFLAGS+=            _IGNORE_GNU_TOOL.make=
 .endif
 
 .if ${_TOOLS_REPLACE.patch} == "YES"
@@ -315,7 +318,7 @@
 .endif
 .if !empty(PKGPATH:Mdevel/patch)
 _TOOLS_OVERRIDE.patch= NO
-MAKEFLAGS+=            _IGNORE_USE_GNU_TOOLS=
+MAKEFLAGS+=            _IGNORE_GNU_TOOL.patch=
 .endif
 
 .if ${_TOOLS_REPLACE.sed} == "YES"
@@ -332,7 +335,7 @@
 .endif
 .if !empty(PKGPATH:Mtextproc/gsed)
 _TOOLS_OVERRIDE.sed=   NO
-MAKEFLAGS+=            _IGNORE_USE_GNU_TOOLS=
+MAKEFLAGS+=            _IGNORE_GNU_TOOL.sed=
 .endif
 
 .if ${_TOOLS_HAS_GNU.yacc} == "YES"
@@ -352,7 +355,7 @@
 .endif
 .if !empty(PKGPATH:Mdevel/bison)
 _TOOLS_OVERRIDE.yacc=  NO
-MAKEFLAGS+=            _IGNORE_USE_GNU_TOOLS=
+MAKEFLAGS+=            _IGNORE_GNU_TOOL.yacc=
 .endif
 
 # If _TOOLS_OVERRIDE.<tool> is actually set to "YES", then we override