From nobody Sat Sep 30 00:56:50 2023 X-Original-To: dev-commits-ports-main@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 4Ry81b0lXSz4v17p; Sat, 30 Sep 2023 00:56:51 +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 4Ry81b05Lhz3ZR6; Sat, 30 Sep 2023 00:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696035411; 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=e1H38pwc1cHpOWuBXXviyHDTxZMxtM8AVxvPNPX8X9o=; b=tSEyUssYWQ8P4MejqhaEmhJiUkZoZ7IX+/hWi87oH7RDsSU/Dp33nghlOdslJ8ritLCufR 0tq1Jj7JHWIyvhIg6iWMz1DPWHoUbB7FzT0icLnVZ9Nrk75BwslvFBGPUxHz+9hJiF+Q1y sZi/wOP637ZSm2RiYmUhg8BxVwNnokdHkSo01oyOQi5sYgdFcREVA1VE9lnyo2jDH6Srby gLjSkmkl8Fx/T15wUpFMvLZDy05STUGa+Z5YhP/jCm64fL6he9BRaDpzhHOJU41NrfH8Hu IjAvI8XJ1RNCoX34cwjnCAD5aU3gAGxaZTRmveu1oIg7BItWpOvhj8vO56uL3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696035411; a=rsa-sha256; cv=none; b=q6oDiWTAsZygltm5A+l/f9WZRK8NzTe+toK7Hc/sL7267H0VCEQ/gT7XjevkXs+764b7LC VnbN5c4MgFxYUFnpyGNmIpJtqdddS5sSX2GcSMfvm0bkIa/1ePTilbBVBSnIYaqst2vJLH b+F0EfbONPrC7hwoj93xQxSdd/Uu/3PD0mUldGcteGoSvoUU6hGrTytUqLD9DX4iBp0FWs b0aWxz1G9krEPSPQszGwqGYjR0V4URBMSoMoingf4RhLD+2NTseHHcp7d5nPkfeIms7erp JyfaG+6jsyvKEayaZ3jtDyaEqZvp/eF9XB6nDu1PdQDJAHp+Wt11+tvqav7PlA== 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=1696035411; 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=e1H38pwc1cHpOWuBXXviyHDTxZMxtM8AVxvPNPX8X9o=; b=TTFxh0wO5weODLpoMBBYtiZv5qsolmoICSjORzZiwfbEDXk/IcmI5IIfB9te3DTayVjajU lASo/EuLmfu0a0gWu4ayjYNTBmchxxYOKY5q92FzLEvi+VtCUAyiNQGg8q5qLd04gOHfGV uAg2zlVgfiSM0EchIE3jTYSG/c6UN8rwxxuE4MHZIpadEPAysjp3nzIqOkVMAyeYAXV+aE RiBj2quSo9rJbScrSmUFmQx3sJzBIjda8o7y0LXrowRz1hI1gFaRHOBAVpHC2yRuA5EkbP iLLvJxDRF+EuQLcTYoc4yMqt8OdmMqtOC8hB3GaYJsFoDBEudzlFuc/j35U2bA== 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 4Ry81Z6HNyzBgv; Sat, 30 Sep 2023 00:56:50 +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 38U0uo7A040565; Sat, 30 Sep 2023 00:56:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38U0uojZ040562; Sat, 30 Sep 2023 00:56:50 GMT (envelope-from git) Date: Sat, 30 Sep 2023 00:56:50 GMT Message-Id: <202309300056.38U0uojZ040562@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 9ef210b6cd70 - main - Mk/Uses/python.mk: Remove PYTHON3_DEFAULT and use PYTHON_DEFAULT instead List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ef210b6cd70dc7713a857618b28faf4e63b7b73 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=9ef210b6cd70dc7713a857618b28faf4e63b7b73 commit 9ef210b6cd70dc7713a857618b28faf4e63b7b73 Author: Po-Chuan Hsieh AuthorDate: 2023-09-30 00:30:47 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-09-30 00:46:32 +0000 Mk/Uses/python.mk: Remove PYTHON3_DEFAULT and use PYTHON_DEFAULT instead - Remove unnecessary PYTHON3_DEFAULT - Replace PYTHON3_DEFAULT with PYTHON_DEFAULT Regarding DEFAULT_VERSIONS, both python and python3 point to the same value which makes python3 a duplicate. And we do not really support python=2.7. Therefore, use python for Python 3.x and python2 for legacy Python 2.7. --- Mk/Uses/python.mk | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index b65b2150f214..69ecd5f5a2ab 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -415,10 +415,6 @@ _PYTHON_RUN_DEP= yes _PYTHON_TEST_DEP= yes . endif -. if ${PYTHON2_DEFAULT} != ${PYTHON_DEFAULT} && ${PYTHON3_DEFAULT} != ${PYTHON_DEFAULT} -WARNING+= "PYTHON_DEFAULT must be a version present in PYTHON2_DEFAULT or PYTHON3_DEFAULT, if you want more Python flavors, set BUILD_ALL_PYTHON_FLAVORS in your make.conf" -. endif - . if ${_PYTHON_ARGS} == 2.7 DEV_WARNING+= "lang/python27 reached End of Life and will be removed somewhere in the future, please convert to a modern version of python" . elif ${_PYTHON_ARGS} == 2 @@ -462,7 +458,7 @@ _PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MAXIMUM} at most # If we have an unsupported version of Python, try another. . if defined(_PYTHON_VERSION_NONSUPPORTED) .undef _PYTHON_VERSION -. for ver in ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS} +. for ver in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${_PYTHON_VERSIONS} __VER= ${ver} . if !defined(_PYTHON_VERSION) && \ !(!empty(_PYTHON_VERSION_MINIMUM) && ( \ @@ -480,7 +476,7 @@ IGNORE= needs an unsupported version of Python # Automatically generates FLAVORS if empty . if empty(FLAVORS) && defined(_PYTHON_FEATURE_FLAVORS) . undef _VALID_PYTHON_VERSIONS -. for ver in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS} +. for ver in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${_PYTHON_VERSIONS} __VER= ${ver} . if !(!empty(_PYTHON_VERSION_MINIMUM) && ( \ ${__VER:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}})) && \ @@ -502,7 +498,7 @@ _ALL_PYTHON_FLAVORS= ${_PYTHON_VERSIONS:S/.//:S/^/py/} . if defined(BUILD_ALL_PYTHON_FLAVORS) || defined(_PYTHON_FEATURE_ALLFLAVORS) FLAVORS= ${_ALL_PYTHON_FLAVORS} . else -. for _v in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} +. for _v in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} _f= py${_v:S/.//} . if ${_ALL_PYTHON_FLAVORS:M${_f}} && !${FLAVORS:M${_f}} . if !empty(FLAVORS)