diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-12 02:35:06 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-12 02:35:06 +0000 |
| commit | d2b62c66fbc6fa5d43546377699557ae9780a930 (patch) | |
| tree | abedabb5e0a307cd66dc653a926873635736358e /devel/zlib | |
| parent | 8d7a59f64baaca76cd5a0b7d879528cc17e128f4 (diff) | |
| download | pkgsrc-d2b62c66fbc6fa5d43546377699557ae9780a930.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/zlib')
| -rw-r--r-- | devel/zlib/buildlink2.mk | 16 | ||||
| -rw-r--r-- | devel/zlib/buildlink3.mk | 16 |
2 files changed, 26 insertions, 6 deletions
diff --git a/devel/zlib/buildlink2.mk b/devel/zlib/buildlink2.mk index 90bb8cc6efd..0a156635c07 100644 --- a/devel/zlib/buildlink2.mk +++ b/devel/zlib/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.13 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.14 2004/02/12 02:35:06 jlam Exp $ .if !defined(ZLIB_BUILDLINK2_MK) ZLIB_BUILDLINK2_MK= # defined @@ -65,8 +65,18 @@ BUILDLINK_USE_BUILTIN.zlib= YES BUILDLINK_USE_BUILTIN.zlib= NO .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mzlib) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + ${BUILDLINK_IS_BUILTIN.zlib} == "YES" +BUILDLINK_USE_BUILTIN.zlib= YES +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.zlib= NO +.endif +.if !empty(PREFER_NATIVE:Mzlib) && \ + ${BUILDLINK_IS_BUILTIN.zlib} == "YES" +BUILDLINK_USE_BUILTIN.zlib= YES +.endif +.if !empty(PREFER_PKGSRC:Mzlib) BUILDLINK_USE_BUILTIN.zlib= NO .endif diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk index 7b6653a13ff..c6175d794bf 100644 --- a/devel/zlib/buildlink3.mk +++ b/devel/zlib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2004/02/12 02:35:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ZLIB_BUILDLINK3_MK:= ${ZLIB_BUILDLINK3_MK}+ @@ -75,8 +75,18 @@ BUILDLINK_USE_BUILTIN.zlib= YES BUILDLINK_USE_BUILTIN.zlib= NO .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mzlib) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.zlib:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.zlib= YES +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.zlib= NO +.endif +.if !empty(PREFER_NATIVE:Mzlib) && \ + !empty(BUILDLINK_IS_BUILTIN.zlib:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.zlib= YES +.endif +.if !empty(PREFER_PKGSRC:Mzlib) BUILDLINK_USE_BUILTIN.zlib= NO .endif |