From nobody Mon Nov 01 19:09:46 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2BD5E182DB93; Mon, 1 Nov 2021 19:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HjjJq0qHhz3Plq; Mon, 1 Nov 2021 19:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC7F216DC5; Mon, 1 Nov 2021 19:09:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1A1J9k5m085349; Mon, 1 Nov 2021 19:09:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A1J9k56085348; Mon, 1 Nov 2021 19:09:46 GMT (envelope-from git) Date: Mon, 1 Nov 2021 19:09:46 GMT Message-Id: <202111011909.1A1J9k56085348@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tobias Kortkamp Subject: git: 8d07ec826a7a - main - Mk/bsd.port.mk: Fix makesum for ports that override MASTER_SITES in make(makesum) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d07ec826a7af0500b5982aed7327fa3f7efeca8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=8d07ec826a7af0500b5982aed7327fa3f7efeca8 commit 8d07ec826a7af0500b5982aed7327fa3f7efeca8 Author: Craig Leres AuthorDate: 2021-10-13 08:24:09 +0000 Commit: Tobias Kortkamp 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}' \