From nobody Tue Nov 30 12:38:59 2021 X-Original-To: dev-commits-ports-all@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 0B13F18AB4E5; Tue, 30 Nov 2021 12:39:00 +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 4J3MGW5G1sz3Dkj; Tue, 30 Nov 2021 12:38:59 +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 907EA16517; Tue, 30 Nov 2021 12:38:59 +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 1AUCcxmR034870; Tue, 30 Nov 2021 12:38:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AUCcxKo034869; Tue, 30 Nov 2021 12:38:59 GMT (envelope-from git) Date: Tue, 30 Nov 2021 12:38:59 GMT Message-Id: <202111301238.1AUCcxKo034869@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Andriy Gapon Subject: git: a50c18ba3174 - main - bsd.port.mk: Do not pass FLAVOR in dependency make environment List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a50c18ba3174831be2a7ad5ad9d3c1410b043fd0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638275939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zuNlSabyqxRiWOyevFlomODer9tf+at1UyyYRzTY3kY=; b=BKX1XtWUf80aaClurKrHd+xcTitpI7WZ+Ls3DwP2Uz31dNN6/5Ss1p0DUOGhXBQG8h6Vsc XdOBgzcyU8O4en9DsjPmrVDPrcIF9TkzeCdMaiqKV6U3zPBtnn9ZbnixNTgGePYm8nTZXa QWGGluJmmg4GhO1ka9jhyyehDxw6flbjdEneqxrFSlHwNvWfH71aOaYzR3ozV41OIm3jGK jtTPiv3mDobODT6hHyfAGnCseqoJKs4qYnxMozq4cwKRMSDUHEPZoRgTJ12eNBDnUjTNdj SlaAsghvW5q2CZKx5RxYrWgDoWKY7k22mOFwUXAOcX+OHo7wXTMTYE1KWcwPHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638275939; a=rsa-sha256; cv=none; b=skKxzrJk5l0OPCvmUY7v6cIrBrQ7XLAfIVG6qizT9kolvpyyG3uSGIqWDkZuercrgun8cE ESGLMDt9pU6BC6Z7IhDUoYCJyRO6v2+dLbBiEGVa//1/B5Hb3l3SGygqtA+gTl2ewzVjGg mKEBIOq0Z0v+s8Ia15J/r43y4LoErnwPQ1LvQijVh/JmsbH2TLPFttoRwOhIZEFoXsgKhQ letQ7X/3+CKZhweIeluejc3B6YCKVrjf4SVX5E4koJes2BpZU+VYq+Kc/0Ne4Vfrc99Vk8 ISuV073s4bG15sqNpsiZ18ZNjrT6Ik5/8bAj/MxnhSl75/3fW9uNxIvycYSOIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by avg (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=a50c18ba3174831be2a7ad5ad9d3c1410b043fd0 commit a50c18ba3174831be2a7ad5ad9d3c1410b043fd0 Author: Ross Williams AuthorDate: 2021-11-30 12:11:12 +0000 Commit: Andriy Gapon CommitDate: 2021-11-30 12:37:50 +0000 bsd.port.mk: Do not pass FLAVOR in dependency make environment The change introduced in bug 256301 (review D30579), which prevents child make processes from receiving an empty FLAVOR variable when FLAVOR should be unset, has the side effect of allowing any FLAVOR already in the parent make process environment to propagate to the child. This revision prevents the FLAVOR from the parent make from incorrectly propagating to the child during a recursive make. Additionally, use "flavored" CURDIR in recursive_dirs variable so that a correct FLAVOR is used for the top-most port as well. Reviewed by: bapt Approved by: bapt Differential Revision: https://reviews.freebsd.org/D32324 --- Mk/bsd.port.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 33179c1caf25..78961a9b6c31 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -4075,7 +4075,7 @@ _FLAVOR_RECURSIVE_SH= \ ${FALSE}; \ fi; \ for dir in $${recursive_dirs}; do \ - unset flavor; \ + unset flavor FLAVOR; \ case $${dir} in \ *@*/*) ;; \ *@*) \ @@ -4146,14 +4146,14 @@ fetch-specials: fetch-recursive: @${ECHO_MSG} "===> Fetching all distfiles for ${PKGNAME} and dependencies" @recursive_cmd="fetch"; \ - recursive_dirs="${.CURDIR} $$(${ALL-DEPENDS-FLAVORS-LIST})"; \ + recursive_dirs="${.CURDIR}${FLAVOR:D@${FLAVOR}} $$(${ALL-DEPENDS-FLAVORS-LIST})"; \ ${_FLAVOR_RECURSIVE_SH} .endif .if !target(fetch-recursive-list) fetch-recursive-list: @recursive_cmd="fetch-list"; \ - recursive_dirs="${.CURDIR} $$(${ALL-DEPENDS-FLAVORS-LIST})"; \ + recursive_dirs="${.CURDIR}${FLAVOR:D@${FLAVOR}} $$(${ALL-DEPENDS-FLAVORS-LIST})"; \ ${_FLAVOR_RECURSIVE_SH} .endif @@ -4220,7 +4220,7 @@ fetch-required-list: fetch-list checksum-recursive: @${ECHO_MSG} "===> Fetching and checking checksums for ${PKGNAME} and dependencies" @recursive_cmd="checksum"; \ - recursive_dirs="${.CURDIR} $$(${ALL-DEPENDS-FLAVORS-LIST})"; \ + recursive_dirs="${.CURDIR}${FLAVOR:D@${FLAVOR}} $$(${ALL-DEPENDS-FLAVORS-LIST})"; \ ${_FLAVOR_RECURSIVE_SH} .endif @@ -5018,7 +5018,7 @@ config: config-recursive: @${ECHO_MSG} "===> Setting user-specified options for ${PKGNAME} and dependencies"; @recursive_cmd="config-conditional"; \ - recursive_dirs="${.CURDIR} $$(${ALL-DEPENDS-FLAVORS-LIST})"; \ + recursive_dirs="${.CURDIR}${FLAVOR:D@${FLAVOR}} $$(${ALL-DEPENDS-FLAVORS-LIST})"; \ ${_FLAVOR_RECURSIVE_SH} .endif # config-recursive @@ -5074,7 +5074,7 @@ showconfig: check-config showconfig-recursive: @${ECHO_MSG} "===> The following configuration options are available for ${PKGNAME} and its dependencies"; @recursive_cmd="showconfig"; \ - recursive_dirs="${.CURDIR} $$(${ALL-DEPENDS-FLAVORS-LIST})"; \ + recursive_dirs="${.CURDIR}${FLAVOR:D@${FLAVOR}} $$(${ALL-DEPENDS-FLAVORS-LIST})"; \ ${_FLAVOR_RECURSIVE_SH} .endif # showconfig-recursive @@ -5101,7 +5101,7 @@ rmconfig: rmconfig-recursive: @${ECHO_MSG} "===> Removing user-specified options for ${PKGNAME} and its dependencies"; @recursive_cmd="rmconfig"; \ - recursive_dirs="${.CURDIR} $$(${ALL-DEPENDS-FLAVORS-LIST})"; \ + recursive_dirs="${.CURDIR}${FLAVOR:D@${FLAVOR}} $$(${ALL-DEPENDS-FLAVORS-LIST})"; \ ${_FLAVOR_RECURSIVE_SH} .endif # rmconfig-recursive