diff options
| author | jlam <jlam> | 2004-02-11 11:30:49 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-11 11:30:49 +0000 |
| commit | f1e499a493c6829f3ab060f6e7777d49f1df6a76 (patch) | |
| tree | 52b113c0ef376141f7b0fef403939f60d89cf6ca /archivers/bzip2 | |
| parent | 3d9c6e23e41ff5e5ede8bea30e1a1218cd4a8006 (diff) | |
| download | pkgsrc-f1e499a493c6829f3ab060f6e7777d49f1df6a76.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 'archivers/bzip2')
| -rw-r--r-- | archivers/bzip2/buildlink3.mk | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/archivers/bzip2/buildlink3.mk b/archivers/bzip2/buildlink3.mk index b0f74472f65..08082f3f076 100644 --- a/archivers/bzip2/buildlink3.mk +++ b/archivers/bzip2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2004/02/06 19:04:24 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2004/02/11 11:30:49 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BZIP2_BUILDLINK3_MK:= ${BZIP2_BUILDLINK3_MK}+ @@ -23,6 +23,16 @@ BUILDLINK_IS_BUILTIN.bzip2!= \ ${ECHO} "NO"; \ fi . endif +# +# Solaris 9 has bzip2 1.0.1, build it on older versions. +# Darwin only has static libbz2.a, which can't be buildlinked. +# +_INCOMPAT_BZIP2?= SunOS-5.[678]-* Darwin-* +. for _pattern_ in ${_INCOMPAT_BZIP2} ${INCOMPAT_BZIP2} +. if !empty(MACHINE_PLATFORM:M${_pattern_}) +BUILDLINK_IS_BUILTIN.bzip2= NO +. endif +. endfor MAKEFLAGS+= BUILDLINK_IS_BUILTIN.bzip2=${BUILDLINK_IS_BUILTIN.bzip2} .endif @@ -44,17 +54,6 @@ BUILDLINK_USE_BUILTIN.bzip2= YES BUILDLINK_USE_BUILTIN.bzip2= NO . else BUILDLINK_USE_BUILTIN.bzip2= YES -# -# Solaris 9 has bzip2 1.0.1, build it on older versions. -# Darwin only has static libbz2.a, which can't be buildlinked. -# -_INCOMPAT_BZIP2= SunOS-5.[678]-* Darwin-* -INCOMPAT_BZIP2?= # empty -. for _pattern_ in ${_INCOMPAT_BZIP2} ${INCOMPAT_BZIP2} -. if !empty(MACHINE_PLATFORM:M${_pattern_}) -BUILDLINK_USE_BUILTIN.bzip2= NO -. endif -. endfor . endif MAKEFLAGS+= BUILDLINK_USE_BUILTIN.bzip2=${BUILDLINK_USE_BUILTIN.bzip2} .endif |