diff options
| author | joerg <joerg> | 2008-05-22 16:27:22 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2008-05-22 16:27:22 +0000 |
| commit | 88e57d408b7d75af6485794f07e87acb8ac245d9 (patch) | |
| tree | 7b37e655069e79fd739911e99f3b8294f9f482fc /mk/checksum/checksum.mk | |
| parent | 1315a4b71d23e708b4b494578f2d18a39393824d (diff) | |
| download | pkgsrc-88e57d408b7d75af6485794f07e87acb8ac245d9.tar.gz | |
Move digest dependency into checksum and fetch part.
Make _ALL_FILES and in turn _CKSUMFILES available earlier.
Use it to only depend on digest if _CKSUMFILES is non-empty.
NO_CHECKSUM will now only skip the checksum and checksum-phase
targets. FAILOVER_FETCH will independently check the sums on
distfiles and depend on digest, fixing the remaining issues
originally raised in PR 34914.
Diffstat (limited to 'mk/checksum/checksum.mk')
| -rw-r--r-- | mk/checksum/checksum.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mk/checksum/checksum.mk b/mk/checksum/checksum.mk index 5b6ec75e06e..8d809e8e5b7 100644 --- a/mk/checksum/checksum.mk +++ b/mk/checksum/checksum.mk @@ -1,4 +1,4 @@ -# $NetBSD: checksum.mk,v 1.12 2007/10/09 19:19:13 martti Exp $ +# $NetBSD: checksum.mk,v 1.13 2008/05/22 16:27:22 joerg Exp $ # # See bsd.checksum.mk for helpful comments. # @@ -6,7 +6,7 @@ _DIGEST_ALGORITHMS?= SHA1 RMD160 _PATCH_DIGEST_ALGORITHMS?= SHA1 -# These variables are set by pkgsrc/mk/fetch/fetch.mk. +# These variables are set by pkgsrc/mk/fetch/bsd.fetch-vars.mk. #_CKSUMFILES?= # empty #_IGNOREFILES?= # empty @@ -32,6 +32,10 @@ _CHECKSUM_CMD= \ TEST=${TOOLS_TEST:Q} \ ${SH} ${PKGSRCDIR}/mk/checksum/checksum \ +.if defined(NO_CHECKSUM) +checksum checksum-phase: + @${DO_NADA} +.else checksum checksum-phase: ${RUN} set -e; \ case ${.TARGET:Q} in \ @@ -45,6 +49,7 @@ checksum checksum-phase: ${ERROR_MSG} "\"${MAKE} NO_CHECKSUM=yes [other args]\"."; \ exit 1; \ fi +.endif _DISTINFO_CMD= ${SETENV} DIGEST=${TOOLS_DIGEST:Q} SED=${TOOLS_SED:Q} \ TEST=${TOOLS_TEST:Q} WC=${TOOLS_WC:Q} \ |