From nobody Sun May 7 16:17:51 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 4QDqMg5KPwz499p3; Sun, 7 May 2023 16:17: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 4QDqMg4kgVz3wgX; Sun, 7 May 2023 16:17:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683476271; 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=p1e3TyR8nZ4L8H0jpZDKxqmUV7Q9StPmR+DvE0I/DBc=; b=C+dVvAi+O4t7yvD8u0r9uZTgSLOwpxdhOvznFJ0nm4MM+MVRPQKfX8YCPYtlYB1FYPwkJK vFx++P+8yJKdYgRDv+L2aAt0S2lh+xBHp0fdKPC9783/H86EUqgj3Z77LgtBQ6JmWUBAWq +gcao+/Fxka95eZoAHZ9Jlt+1B+AJT6IvkIFBHMfY1KidnFngv4h78pS6f+r3nFnZDd+Je JkNBG8qT80xr96rYc377OIbkAyymGqNGtGwoubRvTwyLrdYSbrYM43FBuc1cKPDjOOTtFb hdc1HH66LwVwVM/RI0ijwm2oN2g1LgycH4pg/YHbKtAo3N41R7XIGsfIwGsGTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683476271; 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=p1e3TyR8nZ4L8H0jpZDKxqmUV7Q9StPmR+DvE0I/DBc=; b=HC/f25m98aTIJqLKBQeib3n/Fgfqzq/gMAhWEOT/nLbDFEjNvvSzc5tNBg2FsKhhneYXiL 6O3ZLAoOWOljqe+dYA4m8g46jtsbJfCqUJo3YnVjuULTp4krEgVJL2fP/33VV26OCSc7oE OwBrKVZf55gAyrRIkHweBqBFHhXUMj1AAaxiIbPbIwR4UCbA5/hFB0LB1hKLriTEf87gII dNF1TyrlwVvbDkseQZrkFmMkIFiPfGoBQ/m2qUQ1AGbtyxoL02JUjOh6+u5KrsAHhF5ig9 zcawKc4OPEEvn5OtgAaMMuTKfC8oDxu0yLPe0ZjdnfDqa3priL1qidtaQBmNOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683476271; a=rsa-sha256; cv=none; b=k00GLd0PL2ZqBstu6reqmhcee9FfGwNm/1BgRsz0qnZu3VEBrZRzd0NRCa70hB2Lw+gUor fIR5s4qlgonq2xU+MlneU6YWO5Nxfu56/pUvtbBF5TBUy4qjzE9yjmpDcPZif1BslHp2aD tXfN5Q5sjcPtUcuWt9V8MVDdHu62wZBvFY6Y2d75iY0EhwGE4lZ2+knHwRg7tPu3tJ/JVT hYVbd3AkX5ZCIxbZ8mQ1oLKqiP7wp1Id4KjDKot8ecRXqjBZ1azaSkulV/WKIe2fsoKEsQ 4q/liE/idrwqOqizuAWi0kgjLhySjAv200KBeTNTO5CR6cT1EJjy/L4hJgBdbg== 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 4QDqMg3pRjzQKH; Sun, 7 May 2023 16:17:51 +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 347GHp2c043379; Sun, 7 May 2023 16:17:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 347GHpvr043378; Sun, 7 May 2023 16:17:51 GMT (envelope-from git) Date: Sun, 7 May 2023 16:17:51 GMT Message-Id: <202305071617.347GHpvr043378@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: 78d3d0be394e - main - Mk/Uses/python.mk: Fix 34852a28b2b09ceb1b52db7ac15a192089c5e60c 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78d3d0be394eb329f898017589877e1f2b3281f1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=78d3d0be394eb329f898017589877e1f2b3281f1 commit 78d3d0be394eb329f898017589877e1f2b3281f1 Author: Po-Chuan Hsieh AuthorDate: 2023-05-07 16:17:26 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-05-07 16:17:26 +0000 Mk/Uses/python.mk: Fix 34852a28b2b09ceb1b52db7ac15a192089c5e60c PYTHON3_DEFAULT removal is planned for a PR. --- Mk/Uses/python.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 74660df56a51..c39591cd7bf3 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -390,6 +390,10 @@ _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 @@ -433,7 +437,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 ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${_PYTHON_VERSIONS} +. for ver in ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS} __VER= ${ver} . if !defined(_PYTHON_VERSION) && \ !(!empty(_PYTHON_VERSION_MINIMUM) && ( \ @@ -451,7 +455,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} ${_PYTHON_VERSIONS} +. for ver in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS} __VER= ${ver} . if !(!empty(_PYTHON_VERSION_MINIMUM) && ( \ ${__VER:${_VC}} < ${_PYTHON_VERSION_MINIMUM:${_VC}})) && \ @@ -473,7 +477,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} +. for _v in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} _f= py${_v:S/.//} . if ${_ALL_PYTHON_FLAVORS:M${_f}} && !${FLAVORS:M${_f}} . if !empty(FLAVORS)