From nobody Thu Apr 11 19:43:13 2024 X-Original-To: dev-commits-ports-branches@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 4VFqqj3PVvz5G0Vh; Thu, 11 Apr 2024 19:43:13 +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 4VFqqj2vXGz4nVV; Thu, 11 Apr 2024 19:43:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712864593; 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=9cWpIhewfozhYdvVNi7rA03xPKT6gVoeiP0Cj2mBArk=; b=ul8aDea0wKCbkW33w/7e4/9g+JiXJV9ANf+RMFBm/9NIm3GVMk/oHPtMyTyzBn3ze6L5YP DyhSGXjQpo+WfavsN720N6g+iAnUSOL7hltlq8qdFpQnrx5VkbQ588PLSoz3uvEJKRGhFt Hm8OiiJh/Q0MOty/UmX2U7eVXsIedAWdETiJwY1ifb7Jx6GSNq0P4EJ8nQZ/nhQlfyNBbO TIHGkP4rkvKRbKVhk3iTaJhDJXSHSMZZFWDj4erPAL9SJ19LwsQbAQ4SscllFUqlHu/oBX 4gUMbgZ0bTwKEeE5a+GMZdUtSXx7celEAShZyH/ENGeb6odMO10VzKvIw6VY0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712864593; a=rsa-sha256; cv=none; b=mOVGX6KQYBUuKPKRBLp0rW1yHyNxqnsPPHvQII16ypmladYuA5MJODR/PFBFmxlX3XZqqm /1srC40Dc3FqC6tgjwhxm2TbOw1ww7CMoPBwB+hEy8xUzxOu3RxLDJi1PEJ3xovi/V24kC KhcMVWV3DalECYeE1sV3HfJkwl7SGW/gaTzjbIjzAVQZjYeSkfV5JtWBSnienq3ZQEtPhU LG/E2cJFi04yfRL9YZ5xy7s5xLE1Dw9sflw4KZvuiiaRPqmxIkgWA77sh+P/tvg/VWNfHu xnYDecBWvseQoMjq7b6UBrM6phB7q4i4xD+5oyBh/FyaltcyKF9GlObjBdMh8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712864593; 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=9cWpIhewfozhYdvVNi7rA03xPKT6gVoeiP0Cj2mBArk=; b=p6YIcvU9aWHFb9yedZ68OKxUYN9JazsJ/dOD4nqNJtPsVg6c8p4bE4LdEaaru5bxBOAlzE HuNlm978hpiXHm8IBPjrIgMtILTIT9yz132tl0cCRcgkk2RjiYIokmjoXur4RljBoTW61R VdwEomYj7GmrJBEw8NWZ71tb8ymc+fSGyjravBnPR/O9KPb++WV3/fEVZBen/uSgvKVvAi rUlecuWErow+yb9UdeTJDJH5I+meXDJh2Ab3zfUOAeiMrnxZxs4QEHj82RMPOQhEsyR+n+ kvxYcV3cogM4iwRDwQhPmXnFa1PcF0BQ1qD+X/nBlHt7ltlQKVV1OJYlBPCvfQ== 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 4VFqqj2VsXzK6B; Thu, 11 Apr 2024 19:43:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43BJhDC7091149; Thu, 11 Apr 2024 19:43:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43BJhDmo091146; Thu, 11 Apr 2024 19:43:13 GMT (envelope-from git) Date: Thu, 11 Apr 2024 19:43:13 GMT Message-Id: <202404111943.43BJhDmo091146@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mathieu Arnold Subject: git: 4ec1dbe97a1b - 2024Q2 - Revert "Mk/bsd.port.mk: Allow WITHOUT_FEATURE_PORTS to cancel WITH_FEATURE" List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: dev-commits-ports-branches+owner@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org 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/2024Q2 X-Git-Reftype: branch X-Git-Commit: 4ec1dbe97a1b50e085a997debc67eefa6391ed4c Auto-Submitted: auto-generated The branch 2024Q2 has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ec1dbe97a1b50e085a997debc67eefa6391ed4c commit 4ec1dbe97a1b50e085a997debc67eefa6391ed4c Author: Mathieu Arnold AuthorDate: 2024-04-11 19:42:44 +0000 Commit: Mathieu Arnold CommitDate: 2024-04-11 19:42:44 +0000 Revert "Mk/bsd.port.mk: Allow WITHOUT_FEATURE_PORTS to cancel WITH_FEATURE" This reverts commit d697653cffd19ddaf3cdee2589a830c72ab39777. --- Mk/bsd.port.mk | 39 +++++++++------------------------------ 1 file changed, 9 insertions(+), 30 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index e120b2cd1632..5eb45a350993 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1324,39 +1324,18 @@ LDCONFIG32_DIR= libdata/ldconfig32 TMPDIR?= /tmp . endif # defined(PACKAGE_BUILDING) -# If user specified WITH_FEATURE=yes for a feature that is disabled by default -# treat it as enabled by default -. for feature in ${_LIST_OF_WITH_FEATURES} -. if ${_DEFAULT_WITH_FEATURES:N${feature}} -. if defined(WITH_${feature:tu}) -_DEFAULT_WITH_FEATURES+= ${feature} -. endif -. endif -. endfor - -. for feature in ${_LIST_OF_WITH_FEATURES} -# Create _{WITH,WITHOUT}_FEATURE vars based on user-provided {WITH,WITHOUT}_FEATURE -. if defined(WITH_${feature:tu}) -_WITH_${feature:tu}= ${WITH_${feature:tu}} -. endif -. if defined(WITHOUT_${feature:tu}) -_WITHOUT_${feature:tu}= ${WITHOUT_${feature:tu}} -. endif # For each Feature we support, process the # WITH_FEATURE_PORTS and WITHOUT_FEATURE_PORTS variables +. for feature in ${_LIST_OF_WITH_FEATURES} . if ${_DEFAULT_WITH_FEATURES:M${feature}} -. if defined(WITHOUT_${feature:tu}_PORTS) -. if ${WITHOUT_${feature:tu}_PORTS:M${PKGORIGIN}} -_WITHOUT_${feature:tu}= yes -.undef _WITH_${feature:tu} -. endif -. endif +_WITH_OR_WITHOUT= WITHOUT . else -. if defined(WITH_${feature:tu}_PORTS) -. if ${WITH_${feature:tu}_PORTS:M${PKGORIGIN}} -_WITH_${feature:tu}= yes -.undef _WITHOUT_${feature:tu} -. endif +_WITH_OR_WITHOUT= WITH +. endif + +. if defined(${_WITH_OR_WITHOUT}_${feature:tu}_PORTS) +. if ${${_WITH_OR_WITHOUT}_${feature:tu}_PORTS:M${PKGORIGIN}} +${_WITH_OR_WITHOUT}_${feature:tu}= yes . endif . endif . endfor @@ -1821,7 +1800,7 @@ CFLAGS:= ${CFLAGS:C/${_CPUCFLAGS}//} . endif . for f in ${_LIST_OF_WITH_FEATURES} -. if defined(_WITH_${f:tu}) || ( ${_DEFAULT_WITH_FEATURES:M${f}} && !defined(_WITHOUT_${f:tu}) ) +. if defined(WITH_${f:tu}) || ( ${_DEFAULT_WITH_FEATURES:M${f}} && !defined(WITHOUT_${f:tu}) ) .include "${PORTSDIR}/Mk/Features/$f.mk" . endif . endfor