diff options
| author | jlam <jlam@pkgsrc.org> | 2006-07-13 14:02:34 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-07-13 14:02:34 +0000 |
| commit | 7a2c97d53fecacc96925c6584dd0b8db8ae097b9 (patch) | |
| tree | 054a4952b111d37e6eb8aaa78c0125d125c86d9a /mk/bsd.prefs.mk | |
| parent | 41a963b660aed13cb035a75bf5ee4bb41beaf95a (diff) | |
| download | pkgsrc-7a2c97d53fecacc96925c6584dd0b8db8ae097b9.tar.gz | |
* Add a new stage "bootstrap-depends" that happens before all other
stages, and that installs dependencies listed in BOOTSTRAP_DEPENDS.
The bootstrap-depends step works just like the normal depends step
and honors the value of DEPENDS_TARGET. It's now possible to add
dependencies solely to facilitate fetching the distfiles, e.g.
BOOTSTRAP_DEPENDS+= curl-[0-9]*:../../www/curl
* Teach the tools framework about ":bootstrap" as a tools modifier
which indicates the tool should be added as a dependency via
BOOTSTRAP_DEPENDS.
* Add "digest" to the tools framework.
* Use USE_TOOLS+=digest:bootstrap to force pkgsrc to install digest
before anything else. Get rid of unused "uptodate-digest" target
and related digest version-checking code.
* Finish the refactoring work: split checksum-related code out of
bsd.pkg.mk and into pkgsrc/mk/checksum and replace the "checksum"
target command list with a script that does all the real work.
* Make DIGEST_ALGORITHMS and PATCH_DIGEST_ALGORITHM into private
variables by prepending them with an underscore. Also, rename
_PATCH_DIGEST_ALGORITHM to _PATCH_DIGEST_ALGORITHMS and adjust the
makepatchsum target to allow that variable to contain a list of
algorithms, all of which are used when creating the patch checksums
for ${DISTINFO_FILE}.
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index ca2fb382cf6..8970633d7f2 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.228 2006/07/10 22:59:27 jlam Exp $ +# $NetBSD: bsd.prefs.mk,v 1.229 2006/07/13 14:02:34 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -443,23 +443,6 @@ COMPILER_RPATH_FLAG?= ${_COMPILER_RPATH_FLAG} WHOLE_ARCHIVE_FLAG?= ${_OPSYS_WHOLE_ARCHIVE_FLAG} NO_WHOLE_ARCHIVE_FLAG?= ${_OPSYS_NO_WHOLE_ARCHIVE_FLAG} -.if !defined(DIGEST) -DIGEST:= ${LOCALBASE}/bin/digest -MAKEFLAGS+= DIGEST=${DIGEST:Q} -.endif - -# Only add the DIGEST_VERSION value to MAKEFLAGS when we know -# we've got a valid version number, retrieved from the digest(1) -# binary. This is different to PKGTOOLS_VERSION, since, in that -# case, the build dies when pkg_info(1) is out of date. - -.if !exists(${DIGEST}) -DIGEST_VERSION= 20010301 -.elif !defined(DIGEST_VERSION) -DIGEST_VERSION!= ${DIGEST} -V 2>/dev/null -MAKEFLAGS+= DIGEST_VERSION=${DIGEST_VERSION:Q} -.endif - USE_TOOLS?= # empty # Provide default values for TOOLs used by the top-level make. |