From owner-dev-commits-ports-all@freebsd.org Tue Jun 1 07:17:49 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 796F964EE02; Tue, 1 Jun 2021 07:17:49 +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 4FvNlx2tqvz3klR; Tue, 1 Jun 2021 07:17:49 +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 4B43B1F691; Tue, 1 Jun 2021 07:17:49 +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 1517HniU090908; Tue, 1 Jun 2021 07:17:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1517HnDG090907; Tue, 1 Jun 2021 07:17:49 GMT (envelope-from git) Date: Tue, 1 Jun 2021 07:17:49 GMT Message-Id: <202106010717.1517HnDG090907@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mathieu Arnold Subject: git: e70bedf4f71e - main - Mk/bsd.port.mk: Don't pass up an empty flavor. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mat X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e70bedf4f71eda15307b550cefd028a5a4b0281a Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Jun 2021 07:17:49 -0000 The branch main has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=e70bedf4f71eda15307b550cefd028a5a4b0281a commit e70bedf4f71eda15307b550cefd028a5a4b0281a Author: Mathieu Arnold AuthorDate: 2021-06-01 07:04:25 +0000 Commit: Mathieu Arnold CommitDate: 2021-06-01 07:16:35 +0000 Mk/bsd.port.mk: Don't pass up an empty flavor. The classic way to handle flavors is to set: FLAVORS= foo bar FLAVOR?= ${FLAVORS:[0]} And in that case, FLAVOR is only set if the variable is not defined. If you pass an empty flavor using `FLAVOR=` then it remains empty after that line. It can leads to some ports with complicated logic to assume the wrong flavor is set. PR: 256301 Reported by: avg Differential Revision: https://reviews.freebsd.org/D30579 --- Mk/bsd.port.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 93318b02d332..e514bb7ffec1 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -4095,7 +4095,7 @@ _FLAVOR_RECURSIVE_SH= \ /*) ;; \ *) dir=${PORTSDIR}/$$dir ;; \ esac; \ - (cd $$dir; ${SETENV} FLAVOR=$${flavor} ${MAKE} $${recursive_cmd}); \ + (cd $$dir; ${SETENV} $${flavor:+FLAVOR=$${flavor}} ${MAKE} $${recursive_cmd}); \ done # This script is shared among several dependency list variables. See file for