git: 8d07ec826a7a - main - Mk/bsd.port.mk: Fix makesum for ports that override MASTER_SITES in make(makesum)
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 01 Nov 2021 19:09:46 UTC
The branch main has been updated by tobik:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8d07ec826a7af0500b5982aed7327fa3f7efeca8
commit 8d07ec826a7af0500b5982aed7327fa3f7efeca8
Author: Craig Leres <leres@FreeBSD.org>
AuthorDate: 2021-10-13 08:24:09 +0000
Commit: Tobias Kortkamp <tobik@FreeBSD.org>
CommitDate: 2021-11-01 19:01:08 +0000
Mk/bsd.port.mk: Fix makesum for ports that override MASTER_SITES in make(makesum)
fba040e62bff04323a29d5ad2e21f516b18e9bb4 broke makesum for ports
that conditionally override MASTER_SITES in a make(makesum)
block to simplify maintenance like lang/python-doc-html or
devel/freebsd-sysroot where it is impractical to just statically
list all possible MASTER_SITES. It also broke USES=linux ports
that do the same for DISTFILES.
The breakage with DISTFILES was fixed in
50d2c82e016fd176868cdc6e4befa606fa61c50e by explicitly passing
it to the sub-make fetch. Do the same with MASTER_SITES and
PATCH_SITES so we do not have to workaround this with .MAKEFLAGS
or .export.
PR: 249537
Approved by: portmgr (implicit)
---
Mk/bsd.port.mk | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index ba8e97da8f9c..3a419a69e712 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -3979,7 +3979,9 @@ _CHECKSUM_INIT_ENV= \
# checksum and sizes checks.
makesum: check-sanity
@cd ${.CURDIR} && ${MAKE} fetch NO_CHECKSUM=yes \
- DISABLE_SIZE=yes DISTFILES="${DISTFILES}"
+ DISABLE_SIZE=yes DISTFILES="${DISTFILES}" \
+ MASTER_SITES="${MASTER_SITES}" \
+ PATCH_SITES="${PATCH_SITES}"
@${SETENV} \
${_CHECKSUM_INIT_ENV} \
dp_CHECKSUM_ALGORITHMS='${CHECKSUM_ALGORITHMS:tu}' \