From nobody Thu Mar 09 04:19:17 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 4PXGCn4r0jz3w5c1; Thu, 9 Mar 2023 04:19:17 +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 4PXGCn4LCpz3sf8; Thu, 9 Mar 2023 04:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678335557; 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=WS1TlKrZ/akmfYxTYxiyZ2RZ2/1Eavbp4Exnf5Pun0E=; b=YUMnWrqyK3WMm0yplUNaRRBNMV8ukTna0RKVyfBJrYv+QXxpJotmkdEXpOd6RlwsE8nzAF ETsNfhIIbRJRIkNEGT0gCYT0CUJpe+z2sSI42dBnKSL1MqsFYXxIF8urkxTFzAi1Xcx0fU rKnsItEYy+fQxaOoZCKv0FTrAll+iBd/MK/4qaOqsJUGwBgnWyCPxkUK8HWmcsBowYx8Lk dC1fTpTqryMo+S7k6fUCllCuIz4ckkZfzVq9z1lQFSohsNV+01XypBZ/3pxlr8WOiCcAlA q6YdNFAJQWMh8wezUCO3P2xDzbItlTs1VOJuySXMg4UcBv7b3agbdaIrarKwJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678335557; 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=WS1TlKrZ/akmfYxTYxiyZ2RZ2/1Eavbp4Exnf5Pun0E=; b=CtMej92/rVz3+9/JDkPyJU6IXwXBrnn/sOI1YChPdE8zohbF/i7x1MD8jhctw1msqi4fbU fcqkhjhxLnEUI65K0lsS/rvv7yTTPUmW0Om7/jTfzrqMFXv3KMxsp6Ad8IFQFANzlZYvY/ 9fKW1XRomWrVDdYyRW14CZ0mfptrrndHWLBq5dKvVtLMxvSDQNFuC4d6Y6gFg/eMwdQUZF BPB4wtgO7too58byRmSS0kWeVx4yztuO2VCgWBTSBPBNPbX2/U4zayV1/5V0Q3fDYeGkRQ tgPEPbNeygURZR/nW8J7yWI7q5D8Ka/QHzaeCZeXbU16fT99GuQQgK0nmqZeew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678335557; a=rsa-sha256; cv=none; b=ae2Vl07IVQRXMEsOphrk7PmfNPjDr1cr6BBr/7MmVz70y83PJ7cP/lhOwnRKo11j7218/7 RusIfoi2Lei0Igq8sgqT6PpL50iUgk3fgl/1QMUXjBBM9hP0HIilF5UYqxUGiemeND8tmW Mj9VxbNwnHhSw+aJVQlE2/hd7VOSJZXOj0IIl1WkWRQhfrbejlvNz96Lftf2geQp6nvdsu RkirqjVv8+guOJoQBTESPv10InGhoA/GoqQtBsgwOx6oW8eCpG/MQaT+8jdKq2+/ctnGFH YozQ34lVXvY1ewsts2F1Cda2TiUTezLIOwD+0MrfdeSNB0vBamp8ncVgmfDURg== 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 4PXGCn3PH2ztFL; Thu, 9 Mar 2023 04:19:17 +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 3294JHYw014263; Thu, 9 Mar 2023 04:19:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3294JHvc014262; Thu, 9 Mar 2023 04:19:17 GMT (envelope-from git) Date: Thu, 9 Mar 2023 04:19:17 GMT Message-Id: <202303090419.3294JHvc014262@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: 43ae3588e62e - main - python.mk: use PYTHON_MAJOR_VER for Python 2/3 conditionals 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: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43ae3588e62e8349474181c1ebb1f32e4d249fc8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=43ae3588e62e8349474181c1ebb1f32e4d249fc8 commit 43ae3588e62e8349474181c1ebb1f32e4d249fc8 Author: Charlie Li AuthorDate: 2023-03-09 04:17:52 +0000 Commit: Charlie Li CommitDate: 2023-03-09 04:17:52 +0000 python.mk: use PYTHON_MAJOR_VER for Python 2/3 conditionals --- Mk/Uses/python.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 0c118de3058c..1ed76079cbc9 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -525,7 +525,7 @@ PYTHON_REL= ${PYTHON_DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/:C/\.([0-9])$/ # Might be overridden by calling ports PYTHON_CMD?= ${_PYTHON_BASECMD}${_PYTHON_VERSION} -. if ${PYTHON_VER} != 2.7 +. if ${PYTHON_MAJOR_VER} > 2 . if exists(${PYTHON_CMD}-config) PYTHON_ABIVER!= ${PYTHON_CMD}-config --abiflags . elif ${PYTHON_REL} < 30800 @@ -540,7 +540,7 @@ PYTHON_EXT_SUFFIX= .cpython-${PYTHON_SUFFIX} PYTHON_EXT_SUFFIX= # empty . endif -. if ${PYTHON_MAJOR_VER} == 2 +. if ${PYTHON_MAJOR_VER} < 3 DEPRECATED?= Uses Python 2.7 which is EOLed upstream . endif @@ -629,7 +629,7 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>=63.1.0:devel/py-setuptools@${P . endif . if defined(_PYTHON_FEATURE_PEP517) -. if ${PYTHON_VER} == 2.7 +. if ${PYTHON_MAJOR_VER} < 3 DEV_ERROR+= "USES=python:2.7 is incompatible with USE_PYTHON=pep517" . endif . if defined(_PYTHON_FEATURE_DISTUTILS) @@ -817,7 +817,7 @@ PLIST_SUB+= PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;} \ PYTHON_EXT_SUFFIX=${PYTHON_EXT_SUFFIX} \ PYTHON_VER=${PYTHON_VER} \ PYTHON_VERSION=${PYTHON_VERSION} -. if ${PYTHON_REL} < 30000 +. if ${PYTHON_MAJOR_VER} < 3 SUB_LIST+= PYTHON2="" PYTHON3="@comment " PLIST_SUB+= PYTHON2="" PYTHON3="@comment " . else