diff options
| author | jlam <jlam> | 2005-04-15 05:30:48 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-04-15 05:30:48 +0000 |
| commit | ae6aca84d07ca3a12190cf78d25e6204ddaaa0b8 (patch) | |
| tree | 16832333da0e34b82ac96a261007a8209c5404d7 | |
| parent | f6acb64381f86a1d1c1a2967fdc6e7330c0b9d49 (diff) | |
| download | pkgsrc-ae6aca84d07ca3a12190cf78d25e6204ddaaa0b8.tar.gz | |
Avoid dependency loops by setting and checking TOOLS_IGNORE.* guards.
| -rw-r--r-- | mk/tools/autoconf.mk | 16 | ||||
| -rw-r--r-- | mk/tools/automake.mk | 14 |
2 files changed, 23 insertions, 7 deletions
diff --git a/mk/tools/autoconf.mk b/mk/tools/autoconf.mk index f26f79f38d1..68699c02424 100644 --- a/mk/tools/autoconf.mk +++ b/mk/tools/autoconf.mk @@ -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.ifnames= ifnames ifnames-2.13 _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 @@ TOOLS_REAL_CMD.ifnames= ${LOCALBASE}/bin/ifnames 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 @@ AUTOCONF= ${TOOLS_CMD.autoconf} 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 --git a/mk/tools/automake.mk b/mk/tools/automake.mk index 2241806afa3..b32e7387a00 100644 --- a/mk/tools/automake.mk +++ b/mk/tools/automake.mk @@ -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.automake= automake automake-1.4 \ _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 @@ TOOLS_REAL_CMD.automake= ${LOCALBASE}/bin/automake # 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 @@ TOOLS_REAL_CMD.automake= ${LOCALBASE}/bin/automake-1.4 # ACLOCAL= ${TOOLS_CMD.aclocal} AUTOMAKE= ${TOOLS_CMD.automake} +. endif .endif # For every script that hasn't already been symlinked, we mark it as |