diff options
author | jlam <jlam@pkgsrc.org> | 2004-03-10 17:57:14 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2004-03-10 17:57:14 +0000 |
commit | d0b4c54eb698e718080690cf98ab5b8bbb4001e0 (patch) | |
tree | 1226d07b8f66083168895189decc88848b70903f /archivers/bzip2 | |
parent | 9d61fef8537aed11013bf556e319b2d8e398a11b (diff) | |
download | pkgsrc-d0b4c54eb698e718080690cf98ab5b8bbb4001e0.tar.gz |
Split out the code that deals with checking whether the software is
built-in or not into a separate builtin.mk file. The code to deal
checking for built-in software is much simpler to deal with in pkgsrc.
The buildlink3.mk file for a package will be of the usual format
regardless of the package, which makes it simpler for packagers to
update a package.
The builtin.mk file for a package must define a single yes/no variable
USE_BUILTIN.<pkg> that is used by bsd.buildlink3.mk to decide whether
to use the built-in software or to use the pkgsrc software.
Diffstat (limited to 'archivers/bzip2')
-rw-r--r-- | archivers/bzip2/buildlink3.mk | 74 | ||||
-rw-r--r-- | archivers/bzip2/builtin.mk | 41 |
2 files changed, 48 insertions, 67 deletions
diff --git a/archivers/bzip2/buildlink3.mk b/archivers/bzip2/buildlink3.mk index 818bb26f489..a11040d0d99 100644 --- a/archivers/bzip2/buildlink3.mk +++ b/archivers/bzip2/buildlink3.mk @@ -1,78 +1,18 @@ -# $NetBSD: buildlink3.mk,v 1.14 2004/02/18 16:35:27 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2004/03/10 17:57:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BZIP2_BUILDLINK3_MK:= ${BZIP2_BUILDLINK3_MK}+ -.include "../../mk/bsd.prefs.mk" +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= bzip2 +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nbzip2} +BUILDLINK_PACKAGES+= bzip2 .if !empty(BZIP2_BUILDLINK3_MK:M+) -BUILDLINK_PACKAGES+= bzip2 BUILDLINK_DEPENDS.bzip2+= bzip2>=1.0.1 BUILDLINK_PKGSRCDIR.bzip2?= ../../archivers/bzip2 .endif # BZIP2_BUILDLINK3_MK -BUILDLINK_CHECK_BUILTIN.bzip2?= NO - -.if !defined(BUILDLINK_IS_BUILTIN.bzip2) -BUILDLINK_IS_BUILTIN.bzip2= NO -. if exists(/usr/include/bzlib.h) -BUILDLINK_IS_BUILTIN.bzip2!= \ - if ${GREP} -q "BZ2_" /usr/include/bzlib.h; then \ - ${ECHO} "YES"; \ - else \ - ${ECHO} "NO"; \ - fi -. endif -. if !empty(BUILDLINK_CHECK_BUILTIN.bzip2:M[nN][oO]) -# -# 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 -. endif -MAKEFLAGS+= BUILDLINK_IS_BUILTIN.bzip2=${BUILDLINK_IS_BUILTIN.bzip2} -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.bzip2:M[yY][eE][sS]) -BUILDLINK_USE_BUILTIN.bzip2= YES -.endif - -.if !defined(BUILDLINK_USE_BUILTIN.bzip2) -. if !empty(BUILDLINK_IS_BUILTIN.bzip2:M[yY][eE][sS]) -BUILDLINK_USE_BUILTIN.bzip2= YES -. else -BUILDLINK_USE_BUILTIN.bzip2= NO -. endif - -. if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.bzip2:M[yY][eE][sS]) -BUILDLINK_USE_BUILTIN.bzip2= YES -. endif -. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) -BUILDLINK_USE_BUILTIN.bzip2= NO -. endif -. if !empty(PREFER_NATIVE:Mbzip2) && \ - !empty(BUILDLINK_IS_BUILTIN.bzip2:M[yY][eE][sS]) -BUILDLINK_USE_BUILTIN.bzip2= YES -. endif -. if !empty(PREFER_PKGSRC:Mbzip2) -BUILDLINK_USE_BUILTIN.bzip2= NO -. endif - -. if defined(USE_BZIP2) -BUILDLINK_USE_BUILTIN.bzip2= NO -. endif -.endif - -.if !empty(BUILDLINK_USE_BUILTIN.bzip2:M[nN][oO]) -. if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= bzip2 -. endif -.endif - BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/archivers/bzip2/builtin.mk b/archivers/bzip2/builtin.mk new file mode 100644 index 00000000000..408657f8b59 --- /dev/null +++ b/archivers/bzip2/builtin.mk @@ -0,0 +1,41 @@ +# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:14 jlam Exp $ + +.if !defined(IS_BUILTIN.bzip2) +IS_BUILTIN.bzip2= no +. if exists(/usr/include/bzlib.h) +IS_BUILTIN.bzip2!= \ + if ${GREP} -q "BZ2_" /usr/include/bzlib.h; then \ + ${ECHO} "yes"; \ + else \ + ${ECHO} "no"; \ + fi +. endif +MAKEFLAGS+= IS_BUILTIN.bzip2=${IS_BUILTIN.bzip2} +.endif + +CHECK_BUILTIN.bzip2?= no +.if !empty(CHECK_BUILTIN.bzip2:M[yY][eE][sS]) +USE_BUILTIN.bzip2= yes +.endif + +.if !defined(USE_BUILTIN.bzip2) +USE_BUILTIN.bzip2?= ${IS_BUILTIN.bzip2} +PREFER.bzip2?= pkgsrc + +. if defined(USE_BZIP2) +. if !empty(IS_BUILTIN.bzip2:M[nN][oO]) || \ + (${PREFER.bzip2} == "pkgsrc") +USE_BUILTIN.bzip2= no +. endif +. endif + +# Solaris 9 has bzip2 1.0.1, build it on older versions. +# Darwin only has a static libbz2.a. +# +_INCOMPAT_BZIP2?= SunOS-5.[678]-* Darwin-* +. for _pattern_ in ${_INCOMPAT_BZIP2} ${INCOMPAT_BZIP2} +. if !empty(MACHINE_PLATFORM:M${_pattern_}) +USE_BUILTIN.bzip2= no +. endif +. endfor +.endif # USE_BUILTIN.bzip2 |