From nobody Tue Feb 28 00:00:45 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 4PQcvd52Vfz3tbV6; Tue, 28 Feb 2023 00:00:45 +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 4PQcvd4c8Qz43NF; Tue, 28 Feb 2023 00:00:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677542445; 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=jn+09LbB23oESojBHsYyicsetMEgemwTu47TfkPYDmk=; b=NgISAKFOMTEM1ByJzn7kyg5lF+vWti2DT4a48n4vzGOzJbeJpEY/DCUqrprc54XEvzGhV2 7J2mu82hfcix1nz+VYCZ2Svpga6bEcTtZwpxcBOBEMEeWI+sVyBfRpCOkpzunaEC2hrbox WiiuPEyHYsSShlG189Id4vK8EJqOAv2QyOL26IpLb6DpfkpuLhD87hESVWegmzBG/gA/eS wtggPxgkTWvCWtbQDCWGd99Zn1u2RDQjYTAx2WofOH5EzB9T19lprKkNgLryIKSw70V1Uu WxgXyO7H9ZEH+KhH/KZfWT8kA5xH2cSq0EqjJxWScf4IFIwuheClIEOS6zat+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677542445; 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=jn+09LbB23oESojBHsYyicsetMEgemwTu47TfkPYDmk=; b=YYsLAx6uBqLwdpyhPnXIxrk5jrvCvFMBihm10Int3khNAn3lZZ9JpMcnzpIDLmy29Bkdbu 0JesBPvNQWU80WN+wFTs1oTEl9q4Lgb7j8QspF0FEe2rK32gUQRN8mS+AGnZFKZpTlR4RL KaP27+VJaOwajBqI1qht27/DZftQ667iyvR6fUS7lE15LP4+SkW9De0c/NZF3/ysq99U9H 6KBS2jxh6aUkl+di/TKo2jN0uIkpf2w3paJIniBz6FDiMvJH0HHwf/LszYeOD9RGxP28Vb k3lREBaI8Y3wmRSNUqPFE1v8zxuyrTYnLIYPNNtk0zk4DVpbEGoDqVYRDxI9qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677542445; a=rsa-sha256; cv=none; b=dLaUmA1QeFy3aROMi8IWcCVWhHDR5RjHiDYy083Dj9duzp8EWepdxyoQ3ll12dw0dsAIoM /8mNS1CiDRXp79M1HEGru4LrnhyVpkbAip36reOELgLWv37V08HfJjrMmxWtAbvkhMJh7h v8BamdggR+3RbT/iTqHYtRQ8PSa+BWBGk7SSzli7cbTkZyMU0zUoLCOneiHaT2DdAxiTO/ G58BdHsKhsGbnHgnb0TVTTG/zaBQKDngLXreUQr4j/4eVPH7bh6tCs+5Y9RxkS+fj6ysmK eSmbxRATRyCf3K9SIBrYyDQrZbO4zJuw62147rsibWfk5TrfEN9aUMCFeOqOow== 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 4PQcvd3gjHzm56; Tue, 28 Feb 2023 00:00:45 +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 31S00jks004256; Tue, 28 Feb 2023 00:00:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31S00jv6004255; Tue, 28 Feb 2023 00:00:45 GMT (envelope-from git) Date: Tue, 28 Feb 2023 00:00:45 GMT Message-Id: <202302280000.31S00jv6004255@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: 922e7f41450b - main - lang/python: restore USES=python variables and SUB_LIST (no-op) 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: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 922e7f41450be113e7301c672c8ed3eb352cc8df Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=922e7f41450be113e7301c672c8ed3eb352cc8df commit 922e7f41450be113e7301c672c8ed3eb352cc8df Author: Charlie Li AuthorDate: 2023-02-27 23:56:41 +0000 Commit: Charlie Li CommitDate: 2023-02-27 23:59:30 +0000 lang/python: restore USES=python variables and SUB_LIST (no-op) Has been a to do item for time. These are independent from but used by the bytecode trigger. --- Mk/Uses/python.mk | 25 ++++++++++++++++++++----- lang/python310/Makefile | 9 ++------- lang/python311/Makefile | 9 ++------- lang/python37/Makefile | 8 ++------ lang/python38/Makefile | 8 ++------ lang/python39/Makefile | 9 ++------- 6 files changed, 30 insertions(+), 38 deletions(-) diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index e8b9d2b59343..2da705f42be1 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -257,17 +257,20 @@ # packages for different Python versions. # default: -py${PYTHON_SUFFIX} # -# Using USES=python also will add some useful entries to PLIST_SUB: +# Using USES=python also will add some useful entries to SUB_LIST and PLIST_SUB: # -# PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;} -# PYTHON_LIBDIR=${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;} +# PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR} +# PYTHON_LIBDIR=${PYTHONPREFIX_LIBDIR} # PYTHON_PLATFORM=${PYTHON_PLATFORM} -# PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} +# PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR} # PYTHON_SUFFIX=${PYTHON_SUFFIX} # PYTHON_VER=${PYTHON_VER} # PYTHON_VERSION=${PYTHON_VERSION} # -# and PYTHON2 and PYTHON3 will be set according to the Python version: +# where PYTHON_INCLUDEDIR, PYTHON_LIBDIR and PYTHON_SITELIBDIR have their PREFIX +# stripped for PLIST_SUB. +# +# PYTHON2 and PYTHON3 will also be set according to the Python version: # # PYTHON2="" PYTHON3="@comment " for Python 2.x # PYTHON2="@comment " PYTHON3="" for Python 3.x @@ -785,6 +788,16 @@ ${_stage}_DEPENDS+= ${PYTHON_CMD}:${PYTHON_PORTSDIR} PREFIX= ${PYTHONBASE} . endif +# Substitutions for SUB_FILES +SUB_LIST+= PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR} \ + PYTHON_LIBDIR=${PYTHONPREFIX_LIBDIR} \ + PYTHON_PLATFORM=${PYTHON_PLATFORM} \ + PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR} \ + PYTHON_SUFFIX=${PYTHON_SUFFIX} \ + PYTHON_EXT_SUFFIX=${PYTHON_EXT_SUFFIX} \ + PYTHON_VER=${PYTHON_VER} \ + PYTHON_VERSION=${PYTHON_VERSION} + # Substitutions for pkg-plist # Use a short form of the PYTHONPREFIX_*DIR variables; we don't need the # base directory in the plist file. @@ -797,8 +810,10 @@ PLIST_SUB+= PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;} \ PYTHON_VER=${PYTHON_VER} \ PYTHON_VERSION=${PYTHON_VERSION} . if ${PYTHON_REL} < 30000 +SUB_LIST+= PYTHON2="" PYTHON3="@comment " PLIST_SUB+= PYTHON2="" PYTHON3="@comment " . else +SUB_LIST+= PYTHON2="@comment " PYTHON3="" PLIST_SUB+= PYTHON2="@comment " PYTHON3="" . endif diff --git a/lang/python310/Makefile b/lang/python310/Makefile index f3c13fc09ffd..14f3cc6bce3f 100644 --- a/lang/python310/Makefile +++ b/lang/python310/Makefile @@ -15,8 +15,8 @@ LICENSE= PSFL LIB_DEPENDS= libffi.so:devel/libffi -USES= compiler:c11 cpe ncurses pathfix pkgconfig readline \ - shebangfix ssl tar:xz +USES= compiler:c11 cpe ncurses pathfix pkgconfig \ + python:${PYTHON_DISTVERSION:R},env readline shebangfix ssl tar:xz PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -26,11 +26,6 @@ SHEBANG_FILES+= Lib/test/ziptestdata/exe_with_z64 \ Lib/test/ziptestdata/exe_with_zip \ Lib/test/ziptestdata/header.sh -# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits. -PYTHON_VER= ${PYTHON_DISTVERSION:R} -PYTHON_VERSION= python${PYTHON_VER} -PYTHON_SUFFIX= ${PYTHON_VER:S/.//g} - DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm CONFIGURE_ARGS+= --enable-shared --without-ensurepip \ --with-system-ffi diff --git a/lang/python311/Makefile b/lang/python311/Makefile index 96c4215f8b0e..b3eecab8010f 100644 --- a/lang/python311/Makefile +++ b/lang/python311/Makefile @@ -15,8 +15,8 @@ LICENSE= PSFL LIB_DEPENDS= libffi.so:devel/libffi -USES= compiler:c11 cpe ncurses pathfix pkgconfig readline \ - shebangfix ssl tar:xz +USES= compiler:c11 cpe ncurses pathfix pkgconfig \ + python:${PYTHON_DISTVERSION:R},env readline shebangfix ssl tar:xz PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -26,11 +26,6 @@ SHEBANG_FILES+= Lib/test/ziptestdata/exe_with_z64 \ Lib/test/ziptestdata/exe_with_zip \ Lib/test/ziptestdata/header.sh -# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits. -PYTHON_VER= ${PYTHON_DISTVERSION:R} -PYTHON_VERSION= python${PYTHON_VER} -PYTHON_SUFFIX= ${PYTHON_VER:S/.//g} - DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm CONFIGURE_ARGS+= --enable-shared --without-ensurepip \ --with-system-ffi diff --git a/lang/python37/Makefile b/lang/python37/Makefile index ec98e226f309..97ba530004e6 100644 --- a/lang/python37/Makefile +++ b/lang/python37/Makefile @@ -19,18 +19,14 @@ EXPIRATION_DATE= 2023-06-27 LIB_DEPENDS= libffi.so:devel/libffi \ libmpdec.so:math/mpdecimal -USES= cpe ncurses pathfix pkgconfig readline shebangfix ssl tar:xz +USES= cpe ncurses pathfix pkgconfig python:${PYTHON_DISTVERSION:R},env readline \ + shebangfix ssl tar:xz PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes python_CMD= ${PREFIX}/bin/python${PYTHON_DISTVERSION:R} SHEBANG_FILES= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py -# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits. -PYTHON_VER= ${PYTHON_DISTVERSION:R} -PYTHON_VERSION= python${PYTHON_VER} -PYTHON_SUFFIX= ${PYTHON_VER:S/.//g} - DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm CONFIGURE_ARGS+= --enable-shared --with-system-ffi --with-system-libmpdec --without-ensurepip CONFIGURE_ENV+= OPT="" # Null out OPT to respect user CFLAGS and remove optimizations diff --git a/lang/python38/Makefile b/lang/python38/Makefile index 07d227c23956..1bb042d79d77 100644 --- a/lang/python38/Makefile +++ b/lang/python38/Makefile @@ -15,7 +15,8 @@ LICENSE= PSFL LIB_DEPENDS= libffi.so:devel/libffi -USES= cpe ncurses pathfix pkgconfig readline shebangfix ssl tar:xz +USES= cpe ncurses pathfix pkgconfig python:${PYTHON_DISTVERSION:R},env readline \ + shebangfix ssl tar:xz PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -25,11 +26,6 @@ SHEBANG_FILES+= Lib/test/ziptestdata/exe_with_z64 \ Lib/test/ziptestdata/exe_with_zip \ Lib/test/ziptestdata/header.sh -# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits. -PYTHON_VER= ${PYTHON_DISTVERSION:R} -PYTHON_VERSION= python${PYTHON_VER} -PYTHON_SUFFIX= ${PYTHON_VER:S/.//g} - DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm CONFIGURE_ARGS+= --enable-shared --without-ensurepip \ --with-system-ffi diff --git a/lang/python39/Makefile b/lang/python39/Makefile index c93a47e69fc3..858e90eed6bb 100644 --- a/lang/python39/Makefile +++ b/lang/python39/Makefile @@ -15,8 +15,8 @@ LICENSE= PSFL LIB_DEPENDS= libffi.so:devel/libffi -USES= compiler:c11 cpe ncurses pathfix pkgconfig readline \ - shebangfix ssl tar:xz +USES= compiler:c11 cpe ncurses pathfix pkgconfig \ + python:${PYTHON_DISTVERSION:R},env readline shebangfix ssl tar:xz PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -26,11 +26,6 @@ SHEBANG_FILES+= Lib/test/ziptestdata/exe_with_z64 \ Lib/test/ziptestdata/exe_with_zip \ Lib/test/ziptestdata/header.sh -# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits. -PYTHON_VER= ${PYTHON_DISTVERSION:R} -PYTHON_VERSION= python${PYTHON_VER} -PYTHON_SUFFIX= ${PYTHON_VER:S/.//g} - DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm CONFIGURE_ARGS+= --enable-shared --without-ensurepip \ --with-system-ffi