Reorganize code so that any dependencies are checked as part of deciding

whether the software is built-in or not.  This facilitates implementing
the forthcoming PKGSRC_NATIVE variable.

2 files changed, 29 insertions, 26 deletions

diff --git a/devel/binutils/buildlink2.mk b/devel/binutils/buildlink2.mk
index 557209477f9..a4e80734cc5 100644
--- a/devel/binutils/buildlink2.mk
+++ b/devel/binutils/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.13 2004/02/05 07:17:14 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.14 2004/02/12 01:59:37 jlam Exp $
 
 .if !defined(BINUTILS_BUILDLINK2_MK)
 BINUTILS_BUILDLINK2_MK=	# defined
@@ -9,11 +9,6 @@ BUILDLINK_DEPENDS.binutils?=		binutils>=2.14.0
 BUILDLINK_PKGSRCDIR.binutils?=		../../devel/binutils
 BUILDLINK_DEPMETHOD.binutils?=		build
 
-.if defined(USE_BINUTILS)
-_NEED_BINUTILS=		YES
-.else
-_NEED_BINUTILS=		NO
-#
 # These versions of NetBSD didn't have a toolchain that could be used in
 # place of modern binutils and will need this package
 #
@@ -23,12 +18,17 @@ _INCOMPAT_BINUTILS+=	NetBSD-1.5.*-* NetBSD-1.5[A-X]-*
 # XXX: _INCOMPAT_BINUTILS settings for other operating systems possibly
 # XXX: needed here
 #
-INCOMPAT_BINUTILS?=       # empty
-.  for _pattern_ in ${_INCOMPAT_BINUTILS} ${INCOMPAT_BINUTILS}
-.    if !empty(MACHINE_PLATFORM:M${_pattern_})
-_NEED_BINUTILS=          YES
-.    endif
-.  endfor
+_BUILTIN_BINUTILS=	YES
+.for _pattern_ in ${_INCOMPAT_BINUTILS} ${INCOMPAT_BINUTILS}
+.  if !empty(MACHINE_PLATFORM:M${_pattern_})
+_BUILTIN_BINUTILS=	NO
+.  endif
+.endfor
+
+.if ${_BUILTIN_BINUTILS} == "YES"
+_NEED_BINUTILS=		NO
+.else
+_NEED_BINUTILS=		YES
 .endif
 
 .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
@@ -36,6 +36,10 @@ _NEED_BINUTILS=          YES
 _NEED_BINUTILS=		YES
 .endif
 
+.if defined(USE_BINUTILS)
+_NEED_BINUTILS=		YES
+.endif
+
 .if ${_NEED_BINUTILS} == "YES"
 BUILDLINK_PACKAGES+=		binutils
 BUILDLINK_PREFIX.binutils=	${LOCALBASE}
diff --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk
index f8e98e9fdbd..4dd4af7b804 100644
--- a/devel/binutils/buildlink3.mk
+++ b/devel/binutils/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/02/11 11:30:49 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/02/12 01:59:37 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BINUTILS_BUILDLINK3_MK:=	${BINUTILS_BUILDLINK3_MK}+
@@ -16,6 +16,7 @@ BUILDLINK_CHECK_BUILTIN.binutils?=	NO
 
 .if !defined(BUILDLINK_IS_BUILTIN.binutils)
 BUILDLINK_IS_BUILTIN.binutils=	YES
+.  if !empty(BUILDLINK_CHECK_BUILTIN.binutils:M[nN][oO])
 #
 # These versions of NetBSD didn't have a toolchain that was capable of
 # replacing binutils.
@@ -27,14 +28,21 @@ _INCOMPAT_BINUTILS+=	NetBSD-1.5.*-* NetBSD-1.5[A-X]-*
 # XXX: needed here
 #
 INCOMPAT_BINUTILS?=       # empty
-.  for _pattern_ in ${_INCOMPAT_BINUTILS} ${INCOMPAT_BINUTILS}
-.    if !empty(MACHINE_PLATFORM:M${_pattern_})
+.    for _pattern_ in ${_INCOMPAT_BINUTILS} ${INCOMPAT_BINUTILS}
+.      if !empty(MACHINE_PLATFORM:M${_pattern_})
 BUILDLINK_IS_BUILTIN.binutils=	NO
-.    endif
-.  endfor
+.      endif
+.    endfor
+.  endif
 MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.binutils=${BUILDLINK_IS_BUILTIN.binutils}
 .endif
 
+.if !empty(BUILDLINK_IS_BUILTIN.binutils:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.binutils=	YES
+.else
+BUILDLINK_USE_BUILTIN.binutils=	NO
+.endif
+
 .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
     !empty(PREFER_PKGSRC:Mbinutils)
 BUILDLINK_USE_BUILTIN.binutils=	NO
@@ -48,15 +56,6 @@ BUILDLINK_USE_BUILTIN.binutils=	NO
 BUILDLINK_USE_BUILTIN.binutils=	YES
 .endif
 
-.if !defined(BUILDLINK_USE_BUILTIN.binutils)
-.  if !empty(BUILDLINK_IS_BUILTIN.binutils:M[nN][oO])
-BUILDLINK_USE_BUILTIN.binutils=	NO
-.  else
-BUILDLINK_USE_BUILTIN.binutils=	YES
-.  endif
-MAKEFLAGS+=	BUILDLINK_USE_BUILTIN.binutils=${BUILDLINK_USE_BUILTIN.binutils}
-.endif
-
 .if !empty(BUILDLINK_USE_BUILTIN.binutils:M[nN][oO])
 .  if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=	binutils