diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-11 11:30:49 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-11 11:30:49 +0000 |
| commit | 7c68eb548f89a9227972cfc3d5801f9d5d62110a (patch) | |
| tree | 52b113c0ef376141f7b0fef403939f60d89cf6ca /devel/binutils | |
| parent | 6dbc10b506e6cf94f57aa1cfe0910c783cc2ef5b (diff) | |
| download | pkgsrc-7c68eb548f89a9227972cfc3d5801f9d5d62110a.tar.gz | |
Move the INCOMPAT_FOO checks to a more natural location within the
block that decides whether package FOO is built-in or not. If the
platform is listed in IMCOMPAT_FOO, then treat FOO as being not
built-in.
Diffstat (limited to 'devel/binutils')
| -rw-r--r-- | devel/binutils/buildlink3.mk | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk index 41bf075902a..f8e98e9fdbd 100644 --- a/devel/binutils/buildlink3.mk +++ b/devel/binutils/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2004/02/06 19:04:24 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2004/02/11 11:30:49 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BINUTILS_BUILDLINK3_MK:= ${BINUTILS_BUILDLINK3_MK}+ @@ -16,6 +16,23 @@ BUILDLINK_CHECK_BUILTIN.binutils?= NO .if !defined(BUILDLINK_IS_BUILTIN.binutils) BUILDLINK_IS_BUILTIN.binutils= YES +# +# These versions of NetBSD didn't have a toolchain that was capable of +# replacing binutils. +# +_INCOMPAT_BINUTILS= NetBSD-0.*-* NetBSD-1.[01234]*-* +_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_}) +BUILDLINK_IS_BUILTIN.binutils= NO +. endif +. endfor +MAKEFLAGS+= BUILDLINK_IS_BUILTIN.binutils=${BUILDLINK_IS_BUILTIN.binutils} .endif .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ @@ -36,25 +53,8 @@ BUILDLINK_USE_BUILTIN.binutils= YES BUILDLINK_USE_BUILTIN.binutils= NO . else BUILDLINK_USE_BUILTIN.binutils= YES -# -# These versions of NetBSD didn't have a toolchain that was capable of -# replacing binutils. -# -_INCOMPAT_BINUTILS= NetBSD-0.*-* NetBSD-1.[01234]*-* -_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_}) -BUILDLINK_USE_BUILTIN.binutils= NO -. endif -. endfor . endif -MAKEFLAGS+= \ - BUILDLINK_USE_BUILTIN.binutils=${BUILDLINK_USE_BUILTIN.binutils} +MAKEFLAGS+= BUILDLINK_USE_BUILTIN.binutils=${BUILDLINK_USE_BUILTIN.binutils} .endif .if !empty(BUILDLINK_USE_BUILTIN.binutils:M[nN][oO]) |