From nobody Mon Jan 09 00:35:27 2023 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 4Nqw2l2Gqgz2p7dG; Mon, 9 Jan 2023 00:35:27 +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 4Nqw2l1mq2z3tRG; Mon, 9 Jan 2023 00:35:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673224527; 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=MnfNaN7XSe+BurGjpEFPnDplN8qwrfHAGTuzrgkX8VI=; b=imasU+pUhIrSJjIQiy5GwFT5kWQu9pvDAdB4Z+mJ867vCSUnhwUo2VHA0rgEdokLY1cWqR yW94IiDcSuTRCoCqT30NEdsKmU5Ez5SdBqYGv/LghZIeC5G/hU91MddqiNNCYPy2Jp0gV4 fJwVLx/qf9oT+D7cLG9ecR9ILvAz8Pp80JxHcaggZnyvaBUWdRrOlaHSQzIf5JRr7lZc+d bqItZaijyj/7FaRLkJ0ArDchRYjPS8Aybb+rvLpdSWTJHGn6I7NToF1Z7VFsANo2yiUQ2D drICPzenvSbgxzJkgNKcUvsUqz4swSolN5ZS6B3ABcQGCINIq5O97BNGoHnl3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673224527; 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=MnfNaN7XSe+BurGjpEFPnDplN8qwrfHAGTuzrgkX8VI=; b=V4ZrPaVwug8q1+tW3Kx2EaTpnWulCy55GzQuLT0H1fku7wrh3kwDDOtlZ2HtoNwuqaER6f KwSnqANfIZDVKqSyEJbwLG8iUqhBdVasoGyKRo9MIno61n85W66DjH+uasK7CvFXSG+LpC DNIsxamQVM9jpVSBp571zUjVMbVjzEPyj8NgUzdI7EnBlbebvfGQnbq+rA7yvu+M/DVoJp aa7HAS1U3ImIEyl4Iuuv4hQal2nlyL8SbtOi246Pi08QWdA1qt7oF3JRlI1j/ecuD5UE/F nX3cP4i7bDYvmtf8GXAMJaAIAqLglUyu7FThH6QUxm3/pzDiCWW7JSHVOkz9aA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673224527; a=rsa-sha256; cv=none; b=lYjFexBXY3z0X+uxlzGb9yE6i2Rmfx67HFEqqaCYcHeB5xf0XTRoW/D091BDOYk93qu56H 7CaDlEDf3ECH5KPYiRTcVq6BLsv6ZvRdOqQlOWEhyL84mwqaS9b6gyO3paRqM40GbCUfJk o28vKwI6sQtxy+eQjrG4+LdcYer/4Az5QS8RCadXnuM6YysP3E5RWuwNycipP/3qBNa7u6 k4EJzIZXQLID3KXXbQBAmQZVaqOx12v64XlyLt+iMqJaJEk/lRLsgHXiiM+fwHnNwWKdWo N9mNQKC81gVPSS9lERYBS+W4b5eGPLEDjtxTpjq/L0COOMrDfS4GJfqMB9wM7w== 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 4Nqw2l0qWqz18Hl; Mon, 9 Jan 2023 00:35:27 +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 3090ZRg1092148; Mon, 9 Jan 2023 00:35:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3090ZRGU092147; Mon, 9 Jan 2023 00:35:27 GMT (envelope-from git) Date: Mon, 9 Jan 2023 00:35:27 GMT Message-Id: <202301090035.3090ZRGU092147@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: 9b5f5ab8482f - main - Mk/bsd.gcc.mk: Remove support for USE_GCC=X+ 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: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b5f5ab8482f105311d01a32260ef32bba4a2628 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b5f5ab8482f105311d01a32260ef32bba4a2628 commit 9b5f5ab8482f105311d01a32260ef32bba4a2628 Author: Gerald Pfeifer AuthorDate: 2023-01-09 00:32:48 +0000 Commit: Gerald Pfeifer CommitDate: 2023-01-09 00:34:15 +0000 Mk/bsd.gcc.mk: Remove support for USE_GCC=X+ At this point most ports that employ USE_GCC have the USE_GCC=yes form, some have USE_GCC=X (where X is an older version of GCC than the current default), and none is left with USE_GCC=X+. To reduce complexity and since we are actively tracking upstream GCC with our default version, remove support for the USE_GCC=X+ form. This also derisks Mk/Uses/fortran.mk which aligns with USE_GCC after commit 4191c71fbd229e5a96382bc6fa271a1ce5668b0f. [1] PR: 266196 [1] --- Mk/bsd.gcc.mk | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/Mk/bsd.gcc.mk b/Mk/bsd.gcc.mk index 3c292dc97282..ef3cb5a436e1 100644 --- a/Mk/bsd.gcc.mk +++ b/Mk/bsd.gcc.mk @@ -8,10 +8,8 @@ # your port/system configuration. This is the preferred use of USE_GCC. # It uses the canonical version of GCC defined in bsd.default-versions.mk. # -# If your port needs a specific (minimum) version of GCC, you can easily -# specify that with a USE_GCC= statement. Unless absolutely necessary -# do so by specifying USE_GCC=X+ which requests at least GCC version X. -# To request a specific version omit the trailing + sign. +# If your port needs a specific version of GCC, you can instead specify +# that using USE_GCC=X (where X is the version of GCC). # # Optionally comma-separated arguments follow the version specifier. # Currently we support: @@ -24,13 +22,10 @@ # Examples: # USE_GCC= yes # port requires a current version of GCC # # as defined in bsd.default-versions.mk. -# USE_GCC= 11+ # port requires GCC 11 or later. -# USE_GCC= 9 # port requires GCC 9. +# USE_GCC= 11 # port requires GCC 11. # USE_GCC= yes:build # port requires a current version of GCC at # # build time only. # USE_GCC= 10:build # port requires GCC 10 at build time only. -# USE_GCC= 11+:build # port requires GCC 11 or later at build -# # time only. # # If you are wondering what your port exactly does, use "make test-gcc" # to see some debugging. @@ -66,14 +61,10 @@ IGNORE= bad target specification in USE_GCC; only "build" is supported # Handle USE_GCC=yes. . if ${USE_GCC} == yes -USE_GCC= ${GCC_DEFAULT}+ +USE_GCC= ${GCC_DEFAULT} . endif -# See if we can use a later version or exclusively the one specified. -_USE_GCC:= ${USE_GCC:S/+//} -. if ${USE_GCC} != ${_USE_GCC} -_GCC_ORLATER:= true -. endif +_USE_GCC:= ${USE_GCC} # See whether we have the specific version requested installed already # and save that into _GCC_FOUND. In parallel, check if USE_GCC refers @@ -91,14 +82,6 @@ _GCC_FOUND:= ${_USE_GCC} IGNORE= Unknown version of GCC specified (USE_GCC=${USE_GCC}) . endif -# If the GCC package defined in USE_GCC does not exist, but a later -# version is allowed (for example 8+), go and use the default. -. if defined(_GCC_ORLATER) -. if !defined(_GCC_FOUND) && ${_USE_GCC} < ${GCC_DEFAULT} -_USE_GCC:= ${GCC_DEFAULT} -. endif -. endif # defined(_GCC_ORLATER) - # A concrete version has been selected. Set proper ports dependencies, # CC, CXX, CPP, and flags. V:= ${_USE_GCC:S/.//} @@ -146,11 +129,6 @@ test-gcc: @echo "IGNORE: ${IGNORE}" .else . if defined(USE_GCC) -. if defined(_GCC_ORLATER) - @echo Port can use later versions. -. else - @echo Port cannot use later versions. -. endif @echo Using GCC version ${_USE_GCC} . endif @echo CC=${CC} - CXX=${CXX} - CPP=${CPP}