diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-05 06:58:02 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-05 06:58:02 +0000 |
| commit | 07a9d8dfb209780130723eba289f41872654e7c3 (patch) | |
| tree | 435c664e6b88ad088b762f222d98f5c10bace96c /devel/binutils | |
| parent | f3d1d8cfb0f2a3d26dc60f5cfbaa917b45790f02 (diff) | |
| download | pkgsrc-07a9d8dfb209780130723eba289f41872654e7c3.tar.gz | |
Support a new global variable:
BUILDLINK_PREFER_PKGSRC
This variable determines whether or not to prefer the pkgsrc
versions of software that is also present in the base system.
This variable is multi-state:
defined, or "yes" always prefer the pkgsrc versions
not defined, or "no" only use the pkgsrc versions if
needed by dependency requirements
This can also take a list of packages for which to prefer the
pkgsrc-installed software. The package names may be found by
consulting the value added to BUILDLINK_PACKAGES in the
buildlink[23].mk files for that package.
Diffstat (limited to 'devel/binutils')
| -rw-r--r-- | devel/binutils/buildlink2.mk | 10 | ||||
| -rw-r--r-- | devel/binutils/buildlink3.mk | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/devel/binutils/buildlink2.mk b/devel/binutils/buildlink2.mk index dee91c66b4a..c2f655cb330 100644 --- a/devel/binutils/buildlink2.mk +++ b/devel/binutils/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.10 2003/10/28 15:54:31 heinz Exp $ +# $NetBSD: buildlink2.mk,v 1.11 2004/02/05 06:58:03 jlam Exp $ .if !defined(BINUTILS_BUILDLINK2_MK) BINUTILS_BUILDLINK2_MK= # defined @@ -31,6 +31,14 @@ _NEED_BINUTILS= YES . endfor .endif +.if defined(BUILDLINK_PREFER_PKGSRC) +. if empty(BUILDLINK_PREFER_PKGSRC) || \ + !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(BUILDLINK_PREFER_PKGSRC:Mbinutils) +_NEED_BINUTILS= YES +. endif +.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 ee8d5e0818c..c21c4b03c97 100644 --- a/devel/binutils/buildlink3.mk +++ b/devel/binutils/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:12:32 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/02/05 06:58:02 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BINUTILS_BUILDLINK3_MK:= ${BINUTILS_BUILDLINK3_MK}+ @@ -18,6 +18,14 @@ BUILDLINK_CHECK_BUILTIN.binutils?= NO BUILDLINK_IS_BUILTIN.binutils= YES .endif +.if defined(BUILDLINK_PREFER_PKGSRC) +. if empty(BUILDLINK_PREFER_PKGSRC) || \ + !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(BUILDLINK_PREFER_PKGSRC:Mbinutils) +BUILDLINK_USE_BUILTIN.binutils= NO +. endif +.endif + .if defined(USE_BINUTILS) BUILDLINK_USE_BUILTIN.binutils= NO .endif |