diff options
| author | jlam <jlam> | 2004-02-12 02:35:06 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-12 02:35:06 +0000 |
| commit | 904fb99528f41da42271c33b5e2c2fb70a5898a8 (patch) | |
| tree | abedabb5e0a307cd66dc653a926873635736358e /devel/binutils | |
| parent | 7a53d0f6f6f5347ca16705bd2c05ed41a190a6e0 (diff) | |
| download | pkgsrc-904fb99528f41da42271c33b5e2c2fb70a5898a8.tar.gz | |
Create a new variable PREFER_NATIVE that has the opposite semantics
as PREFER_PKGSRC. Preferences are determined by the most specific
instance of the package in either PREFER_PKGSRC or PREFER_NATIVE. If
a package is specified in neither or in both variables, then PREFER_PKGSRC
has precedence over PREFER_NATIVE.
Diffstat (limited to 'devel/binutils')
| -rw-r--r-- | devel/binutils/buildlink2.mk | 16 | ||||
| -rw-r--r-- | devel/binutils/buildlink3.mk | 16 |
2 files changed, 26 insertions, 6 deletions
diff --git a/devel/binutils/buildlink2.mk b/devel/binutils/buildlink2.mk index a4e80734cc5..96240fc9fd3 100644 --- a/devel/binutils/buildlink2.mk +++ b/devel/binutils/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.14 2004/02/12 01:59:37 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.15 2004/02/12 02:35:06 jlam Exp $ .if !defined(BINUTILS_BUILDLINK2_MK) BINUTILS_BUILDLINK2_MK= # defined @@ -31,8 +31,18 @@ _NEED_BINUTILS= NO _NEED_BINUTILS= YES .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mbinutils) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + ${_BUILTIN_BINUTILS} == "YES" +_NEED_BINUTILS= NO +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +_NEED_BINUTILS= YES +.endif +.if !empty(PREFER_NATIVE:Mbinutils) && \ + ${_BUILTIN_BINUTILS} == "YES" +_NEED_BINUTILS= NO +.endif +.if !empty(PREFER_PKGSRC:Mbinutils) _NEED_BINUTILS= YES .endif diff --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk index 4dd4af7b804..0a763e11927 100644 --- a/devel/binutils/buildlink3.mk +++ b/devel/binutils/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2004/02/12 01:59:37 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2004/02/12 02:35:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BINUTILS_BUILDLINK3_MK:= ${BINUTILS_BUILDLINK3_MK}+ @@ -43,8 +43,18 @@ BUILDLINK_USE_BUILTIN.binutils= YES BUILDLINK_USE_BUILTIN.binutils= NO .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mbinutils) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.binutils:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.binutils= YES +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.binutils= NO +.endif +.if !empty(PREFER_NATIVE:Mbinutils) && \ + !empty(BUILDLINK_IS_BUILTIN.binutils:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.binutils= YES +.endif +.if !empty(PREFER_PKGSRC:Mbinutils) BUILDLINK_USE_BUILTIN.binutils= NO .endif |