diff options
| author | jlam <jlam> | 2005-04-26 21:56:13 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-04-26 21:56:13 +0000 |
| commit | 61fe3ce61ed8d6eac9fa75df5da14ae541d04cfb (patch) | |
| tree | 9990058506a2d5f1fb6c37be8641e2fdfd80bf78 /mk | |
| parent | a28adae80e9440709499acdebec8ff31a4ce317a (diff) | |
| download | pkgsrc-61fe3ce61ed8d6eac9fa75df5da14ae541d04cfb.tar.gz | |
Fix conditions on grep and gzip so that if any of the TOOLS_IGNORE.* are
defined for their respective utilities, then we skip the processing to
avoid dependency loops.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/tools/replace.mk | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index c17a48650b3..9df13768ca2 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.21 2005/04/26 19:15:38 jlam Exp $ +# $NetBSD: replace.mk,v 1.22 2005/04/26 21:56:13 jlam Exp $ # # This Makefile fragment handles "replacements" of system-supplied # tools with pkgsrc versions. The replacements are placed under @@ -163,9 +163,12 @@ ${_TOOLS_VARNAME.bison}= ${TOOLS_REAL_CMD.bison} ${TOOLS_ARGS.bison} TOOLS_CMD.bison= ${TOOLS_DIR}/bin/yacc .endif -.if (!defined(TOOLS_IGNORE.egrep) && !empty(USE_TOOLS:Megrep)) || \ - (!defined(TOOLS_IGNORE.fgrep) && !empty(USE_TOOLS:Mfgrep)) || \ - (!defined(TOOLS_IGNORE.grep) && !empty(USE_TOOLS:Mgrep)) +.if (!defined(TOOLS_IGNORE.egrep) && \ + !defined(TOOLS_IGNORE.fgrep) && \ + !defined(TOOLS_IGNORE.grep)) && \ + (!empty(USE_TOOLS:Megrep) || \ + !empty(USE_TOOLS:Mfgrep) || \ + !empty(USE_TOOLS:Mgrep)) . if !empty(PKGPATH:Mtextproc/grep) MAKEFLAGS+= TOOLS_IGNORE.egrep= MAKEFLAGS+= TOOLS_IGNORE.fgrep= @@ -264,9 +267,12 @@ ${_TOOLS_VARNAME.gsed}= ${TOOLS_REAL_CMD.gsed} TOOLS_CMD.gsed= ${TOOLS_DIR}/bin/sed .endif -.if (!defined(TOOLS_IGNORE.gunzip) && !empty(USE_TOOLS:Mgunzip)) || \ - (!defined(TOOLS_IGNORE.gzcat) && !empty(USE_TOOLS:Mgzcat)) || \ - (!defined(TOOLS_IGNORE.gzip) && !empty(USE_TOOLS:Mgzip)) +.if (!defined(TOOLS_IGNORE.gunzip) && \ + !defined(TOOLS_IGNORE.gzcat) && \ + !defined(TOOLS_IGNORE.gzip)) && \ + (!empty(USE_TOOLS:Mgunzip) || \ + !empty(USE_TOOLS:Mgzcat) || \ + !empty(USE_TOOLS:Mgzip)) . if !empty(PKGPATH:Marchiver/gzip-base) MAKEFLAGS+= TOOLS_IGNORE.gunzip= MAKEFLAGS+= TOOLS_IGNORE.gzcat= |