diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-04 01:13:04 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-04 01:13:04 +0000 |
| commit | b5e26e997e6f38094d3e608fc140a3519149c57d (patch) | |
| tree | b1c7b568a0205579c61b8c52b49202d6cf1bab64 | |
| parent | ff0c12c2bd6a2be070801a75a3b2d29ec3518757 (diff) | |
| download | pkgsrc-b5e26e997e6f38094d3e608fc140a3519149c57d.tar.gz | |
Instead of tedious validating every platform for full caching compliance,
just assume they do unless they're known _not_ to work. So far, only
Darwin-5.* suffers from this problem, apparently because they use some
bizarre version of zsh for /bin/sh.
| -rw-r--r-- | mk/buildlink2/bsd.buildlink2.mk | 23 | ||||
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 27 |
2 files changed, 24 insertions, 26 deletions
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk index e094188210b..6c81a68a6f6 100644 --- a/mk/buildlink2/bsd.buildlink2.mk +++ b/mk/buildlink2/bsd.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink2.mk,v 1.108 2004/02/02 10:26:42 jlam Exp $ +# $NetBSD: bsd.buildlink2.mk,v 1.109 2004/02/04 01:13:04 jlam Exp $ # # An example package buildlink2.mk file: # @@ -71,22 +71,21 @@ BUILDLINK_SHELL?= ${SH} # CONFIGURE_ENV+= BUILDLINK_UPDATE_CACHE=no -# The caching code, which greatly speeds up the build process, works only -# on certain platforms. +# The caching code, which greatly speeds up the build process, doesn't +# work completely correctly on certain platforms. # -_BLNK_CACHE_ALL= # empty -_BLNK_CACHE_ALL+= Darwin-6*-* -_BLNK_CACHE_ALL+= FreeBSD-*-* -_BLNK_CACHE_ALL+= IRIX-*-* -_BLNK_CACHE_ALL+= NetBSD-1.[5-9]*-* -_BLNK_CACHE_ALL+= SunOS-[25].[89]-* +_BLNK_PARTIAL_CACHE_ONLY= Darwin-5.*-* -.for _pattern_ in ${_BLNK_CACHE_ALL} +_BLNK_FULL_CACHING?= YES +.for _pattern_ in ${_BLNK_PARTIAL_CACHE_ONLY} . if !empty(MACHINE_PLATFORM:M${_pattern_}) -CONFIGURE_ENV+= BUILDLINK_CACHE_ALL=yes -MAKE_ENV+= BUILDLINK_CACHE_ALL=yes +_BLNK_FULL_CACHING= NO . endif .endfor +.if !empty(_BLNK_FULL_CACHING:M[yY][eE][sS]) +CONFIGURE_ENV+= BUILDLINK_CACHE_ALL=yes +MAKE_ENV+= BUILDLINK_CACHE_ALL=yes +.endif .if defined(USE_X11) USE_X11_LINKS?= YES diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 747d11ecdc9..e773a0b058b 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.68 2004/02/02 10:26:42 jlam Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.69 2004/02/04 01:13:05 jlam Exp $ # # An example package buildlink3.mk file: # @@ -588,16 +588,6 @@ do-buildlink: ${_target_} # CONFIGURE_ENV+= BUILDLINK_UPDATE_CACHE=no -# The caching code, which greatly speeds up the build process, works only -# on certain platforms. -# -_BLNK_CACHE_ALL= # empty -_BLNK_CACHE_ALL+= Darwin-6*-* -_BLNK_CACHE_ALL+= FreeBSD-*-* -_BLNK_CACHE_ALL+= IRIX-*-* -_BLNK_CACHE_ALL+= NetBSD-1.[5-9]*-* -_BLNK_CACHE_ALL+= SunOS-[25].[89]-* - # There are three different parts we can add to the common transforming # cache to speed things up: # @@ -615,12 +605,21 @@ _BLNK_CACHE_ALL+= SunOS-[25].[89]-* # _BLNK_SEED_CACHE?= passthru # transform block -.for _pattern_ in ${_BLNK_CACHE_ALL} +# The caching code, which greatly speeds up the build process, doesn't +# work completely correctly on certain platforms. +# +_BLNK_PARTIAL_CACHE_ONLY= Darwin-5.*-* + +_BLNK_FULL_CACHING?= YES +.for _pattern_ in ${_BLNK_PARTIAL_CACHE_ONLY} . if !empty(MACHINE_PLATFORM:M${_pattern_}) -CONFIGURE_ENV+= BUILDLINK_CACHE_ALL=yes -MAKE_ENV+= BUILDLINK_CACHE_ALL=yes +_BLNK_FULL_CACHING= NO . endif .endfor +.if !empty(_BLNK_FULL_CACHING:M[yY][eE][sS]) +CONFIGURE_ENV+= BUILDLINK_CACHE_ALL=yes +MAKE_ENV+= BUILDLINK_CACHE_ALL=yes +.endif # _BLNK_PASSTHRU_DIRS contains the list of directories which we allow in # preprocessor's header, linker's library, or the runtime library |