From nobody Thu Apr 11 19:42:23 2024 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 4VFqpm0tjFz5Hxrn; Thu, 11 Apr 2024 19:42:24 +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 4VFqpm0L8Sz4nCS; Thu, 11 Apr 2024 19:42:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712864544; 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=VpqHouif8Met5heWodhi2eNjW3c8aLoZTOlOGWnbf6s=; b=ib1zQDG/3Gu9P4ASxj1TthkAZAZe6GfvhYozZqgh51HwWqdKdISkRXiCt0fXR36jipuz0S +5k3IGfbpxBUUSbc7BLksJ+H6YK+7yj9LQXjAFBHnMwQAxoszwBg4xtYKQ1H1rjrt7eMZm f0V7P39ae182pApflMjRCoaO6vG/00vmBTO1kBpiRbLHQi7VAjoMSR+2dJV+SxQ8gqoicR TVcZIbEYI2h/9HV+VV2qBc6Vj9Ue4TiP9Yxm6oJlAjxANUXwaU7EhIrBaLg83XldYK1YKU LqoXlDiZq9+zPVn733WNhyPdi9snlZpKH6yLhnoHKBoIKHHa/1lOoWfNNwznZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712864544; a=rsa-sha256; cv=none; b=DcPWvbYq8G2tkkyRF8L+lQb1HhHH8GmjD15lgVZzAl6Ra50lQeFbZZFyxtdKYvXXRJxfTi UEZb2v00EijriVIgJI3EBgPDdBLYDXUmeYu6mTqcVZE27ofMqwmSpvJtzK6hcDrLewm4Qs GHMS7Bm1+cXb/MzZa99edbZ1EsmdFPpWX+s2IaPq7NkbEi0V+ZzK8tmkrtys6UTViyPWfX 0xhHCdFH2gQ1cQtL8332d9Mw/VM1r/UmCr3eXz+Cg/ohPXEDHPNUaXYEEM5qfcCwqGz9HU Ubd9mBAisLVHepIBtPWVQfHJ31dsISca7mJvgtORJlJUaYv3m0195XSbp1oasQ== 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=1712864544; 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=VpqHouif8Met5heWodhi2eNjW3c8aLoZTOlOGWnbf6s=; b=CfZKZOiWcWqnaQqWuRKUbsF0zXyQ6wfVjJOBaK0vpbywxxlxapgn91AKPlnrZI+dmw6xJM +mnXdJetDItu3gEyVlzhijez7Qk0VD+mTLNt8tGPL2uEAnLhLh0qaGN9UqdBrV6L7Ao7QG gxsVfM38kUu7rDaRv3RhPbVMyLxY5lre08ScUK8pdql73t1P3vqi/NtpJy/1E4CFNtX2ue E6eYGHIxzCTsMjF4PGyeluCKGupr3K6NS/16h6wkTTkqpUZxlhG8SvJ2Y25MaB7TjSchhE p/1ZelQ8HB3CnRU1MhIlKw4l90UZq99+rHx54p0NldI5CVzEdSro0BqF5M9CWw== 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 4VFqpl73WdzJr4; Thu, 11 Apr 2024 19:42:23 +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 43BJgNmd090849; Thu, 11 Apr 2024 19:42:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43BJgNYa090846; Thu, 11 Apr 2024 19:42:23 GMT (envelope-from git) Date: Thu, 11 Apr 2024 19:42:23 GMT Message-Id: <202404111942.43BJgNYa090846@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: 06601473b831 - main - Revert "Mk/bsd.port.mk: Allow WITHOUT_FEATURE_PORTS to cancel WITH_FEATURE" 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: dev-commits-ports-all+owner@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: mat X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06601473b8318a5051d067c3a28121aa8bdf8e14 Auto-Submitted: auto-generated The branch main has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=06601473b8318a5051d067c3a28121aa8bdf8e14 commit 06601473b8318a5051d067c3a28121aa8bdf8e14 Author: Mathieu Arnold AuthorDate: 2024-04-11 19:40:19 +0000 Commit: Mathieu Arnold CommitDate: 2024-04-11 19:41:11 +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 1176da04e80e..a0cde979317e 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