[pkgsrc/trunk]: pkgsrc/mk/tools Avoid dependency loops by setting and checkin...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4d977f9b2774
branches:  trunk
changeset: 492538:4d977f9b2774
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Apr 15 05:30:48 2005 +0000

description:
Avoid dependency loops by setting and checking TOOLS_IGNORE.* guards.

diffstat:

 mk/tools/autoconf.mk |  16 ++++++++++++----
 mk/tools/automake.mk |  14 +++++++++++---
 2 files changed, 23 insertions(+), 7 deletions(-)

diffs (91 lines):

diff -r 80f82d677a94 -r 4d977f9b2774 mk/tools/autoconf.mk
--- a/mk/tools/autoconf.mk      Fri Apr 15 05:17:49 2005 +0000
+++ b/mk/tools/autoconf.mk      Fri Apr 15 05:30:48 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: autoconf.mk,v 1.1 2005/04/15 00:00:21 jlam Exp $
+# $NetBSD: autoconf.mk,v 1.2 2005/04/15 05:30:48 jlam Exp $
 #
 # This Makefile fragment handles packages that use GNU autoconf.
 #
@@ -50,7 +50,10 @@
 
 _TOOLS_AUTOCONF_LINKS= # empty
 
-.if !empty(USE_TOOLS:Mautoconf)
+.if !defined(TOOLS_IGNORE.autoconf) && !empty(USE_TOOLS:Mautoconf)
+.  if !empty(PKGPATH:Mdevel/autoconf)
+MAKEFLAGS+=            TOOLS_IGNORE.autoconf=
+.  else
 AUTOCONF_REQD?=                2.50
 BUILD_DEPENDS+=                autoconf>=${AUTOCONF_REQD}:../../devel/autoconf
 
@@ -88,9 +91,13 @@
 AUTOCONF=      ${TOOLS_CMD.autoconf}
 AUTOHEADER=    ${TOOLS_CMD.autoheader}
 AUTORECONF=    ${TOOLS_CMD.autoreconf}
+.  endif
 .endif
 
-.if !empty(USE_TOOLS:Mautoconf213)
+.if !defined(TOOLS_IGNORE.autoconf213) && !empty(USE_TOOLS:Mautoconf213)
+.  if !empty(PKGPATH:Mdevel/autoconf213)
+MAKEFLAGS+=            TOOLS_IGNORE.autoconf213=
+.  else
 AUTOCONF_REQD?=                2.13
 BUILD_DEPENDS+=                autoconf213>=${AUTOCONF_REQD}:../../devel/autoconf213
 
@@ -125,8 +132,9 @@
 AUTOHEADER=    ${TOOLS_CMD.autoheader}
 AUTORECONF=    ${TOOLS_CMD.autoreconf}
 
-.  if defined(USE_LIBTOOL)
+.    if defined(USE_LIBTOOL)
 pre-configure: tools-libtool-m4-override
+.    endif
 .  endif
 .endif
 
diff -r 80f82d677a94 -r 4d977f9b2774 mk/tools/automake.mk
--- a/mk/tools/automake.mk      Fri Apr 15 05:17:49 2005 +0000
+++ b/mk/tools/automake.mk      Fri Apr 15 05:30:48 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: automake.mk,v 1.1 2005/04/15 00:00:21 jlam Exp $
+# $NetBSD: automake.mk,v 1.2 2005/04/15 05:30:48 jlam Exp $
 #
 # This Makefile fragment handles packages that use GNU automake.
 #
@@ -67,7 +67,10 @@
 
 _TOOLS_AUTOMAKE_LINKS= # empty
 
-.if !empty(USE_TOOLS:Mautomake)
+.if !defined(TOOLS_IGNORE.automake) && !empty(USE_TOOLS:Mautomake)
+.  if !empty(PKGPATH:Mdevel/automake)
+MAKEFLAGS+=            TOOLS_IGNORE.automake=
+.  else
 AUTOMAKE_REQD?=                1.9
 BUILD_DEPENDS+=                automake>=${AUTOMAKE_REQD}:../../devel/automake
 USE_TOOLS+=            autoconf
@@ -86,9 +89,13 @@
 #
 ACLOCAL=       ${TOOLS_CMD.aclocal}
 AUTOMAKE=      ${TOOLS_CMD.automake}
+.  endif
 .endif
 
-.if !empty(USE_TOOLS:Mautomake14)
+.if !defined(TOOLS_IGNORE.automake14) && !empty(USE_TOOLS:Mautomake14)
+.  if !empty(PKGPATH:Mdevel/automake14)
+MAKEFLAGS+=            TOOLS_IGNORE.automake14=
+.  else
 AUTOMAKE_REQD?=                1.4
 BUILD_DEPENDS+=                automake14>=${AUTOMAKE_REQD}:../../devel/automake14
 USE_TOOLS+=            autoconf213
@@ -107,6 +114,7 @@
 #
 ACLOCAL=       ${TOOLS_CMD.aclocal}
 AUTOMAKE=      ${TOOLS_CMD.automake}
+.  endif
 .endif
 
 # For every script that hasn't already been symlinked, we mark it as