From nobody Mon Feb 27 21:05:09 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 4PQY111rWkz3t82h; Mon, 27 Feb 2023 21:05:09 +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 4PQY111gfgz3CDK; Mon, 27 Feb 2023 21:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677531909; 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=8qDoB0OVRZTkSYUT0G11FtqSq2deIMSITeEdgcB7d04=; b=bAtphIcLSaBYMKbK8nxBWcieB8hvjEKwE+3D95xR9KRipJuBUwlxzX5u4HFUAMqyUEh7zX qHW+STdAf7wgnlziQVe4UHjYggXI0bWCUEN5IyYFcU2F1qjsPRoyhwHNLjtLfCKhnBTeEz Q5/aokLHEXPOP3PzOpHWvvnf+rqWAZeP+P/+2ny0TyweeToNV64X/FM0GcT837JWQ9qqQn 6LieLJwhk8G6w8Gjwu7Jb4w0pjmb0KITMQFqEE+I+I1vlx0DEKwat1FYn5bIuToZuGgrey BhBOtrIH/BLt0qCUKGBdaoJwRbf/nGnjuX/fAco83NRYNubotIGhM/A3hfbQ3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677531909; 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=8qDoB0OVRZTkSYUT0G11FtqSq2deIMSITeEdgcB7d04=; b=DKVa91zdVMgC+oYNTpyxRvoHuXX1pCR+tA13aMm9agnG2Cq8pJXDfUy2cXJ/yV9171o4us 4SXJGdhulJOWVFu6ggyQGbAPZYFOZBmnAoaTv8cQXzEjLq1+U75AFPYKf3MODWtTpQyRDp QVBEzjMmamgHM9c4ZWVjXYFouby62RyskDVh8RslC2YhyZgPsEwrzQC/C+ySr99jSta2GC w41gQmkPWrU4ip/UnOhbwq513vWpySq7vbzN5e51SXStQkhizHzy25mV5O2kEnLmZjY2iA 3SBztM8RghYpeBTDGlk+f9JeO4okxnLDhYkKUv30w8Q5BDjzmSyW4h+0EG+vwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677531909; a=rsa-sha256; cv=none; b=Cp0dmqZ06Rmv5UJBfwLhXpLRFOLYANQytk9jZvLgAbrFLlqfFgtPCmH91PUQbrQJHCtEQj dVDa0KyneQYzW2O0nUIxdFkpPnjDxafL3hwT1hGVTAznc6+Y3dsDvEN0FT3luW/M3piY3Z KsClBwEuICesLLei7HULcez6OiDijBESiFdqN16UXwoDw4uxl3pkn/djkHGQ50vq/LLRj3 j26n1nGCuW+nqtvr/SOhKDFtPX0g/8V3UW9KXzQlWm3FhWilVjBrbxIPLGa/wMc/mlxERW onjSlztvVlNY7/AzI5OQM1o44nK6NNaecAST9ip1HB+cO3m1t6pXdn/+3tf8Pw== 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 4PQY110l6MzgVf; Mon, 27 Feb 2023 21:05:09 +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 31RL59iW014620; Mon, 27 Feb 2023 21:05:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RL593a014619; Mon, 27 Feb 2023 21:05:09 GMT (envelope-from git) Date: Mon, 27 Feb 2023 21:05:09 GMT Message-Id: <202302272105.31RL593a014619@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: a9d9d3a42723 - main - lang/python: Revert "add bytecode trigger" 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: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a9d9d3a4272303bf226b9deb55c42303e4fcebdc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=a9d9d3a4272303bf226b9deb55c42303e4fcebdc commit a9d9d3a4272303bf226b9deb55c42303e4fcebdc Author: Matthias Andree AuthorDate: 2023-02-27 21:01:32 +0000 Commit: Matthias Andree CommitDate: 2023-02-27 21:04:52 +0000 lang/python: Revert "add bytecode trigger" This reverts commit c17ddfbf66e2801ec620d49979aca3d7077d7002. This causes breakage on several ports, and the next iteration requires a full exp-run. See: Differential Revision: https://reviews.freebsd.org/D34739 --- CHANGES | 8 ------- Mk/Uses/python.mk | 25 ++++---------------- UPDATING | 17 -------------- lang/python310/Makefile | 12 ++++++---- lang/python310/files/python3.10.ucl.in | 40 -------------------------------- lang/python311/Makefile | 12 ++++++---- lang/python311/files/python3.11.ucl.in | 40 -------------------------------- lang/python37/Makefile | 11 +++++---- lang/python37/files/python3.7.ucl.in | 42 ---------------------------------- lang/python38/Makefile | 11 +++++---- lang/python38/files/python3.8.ucl.in | 42 ---------------------------------- lang/python39/Makefile | 12 ++++++---- lang/python39/files/python3.9.ucl.in | 40 -------------------------------- 13 files changed, 43 insertions(+), 269 deletions(-) diff --git a/CHANGES b/CHANGES index a8736d2217ea..2c65d5dbbe11 100644 --- a/CHANGES +++ b/CHANGES @@ -10,14 +10,6 @@ in the release notes and/or placed into UPDATING. All ports committers are allowed to commit to this file. -20230215: -AUTHOR: vishwin@FreeBSD.org - - USES=python now includes SUB_LIST entries to facilitate common - substitutions for python.mk variables other than in ${PLIST}. - They are the same as PLIST_SUB, except PYTHON_INCLUDEDIR, - PYTHON_LIBDIR and PYTHON_SITELIBDIR include ${PREFIX}. - 20230111: AUTHOR: vishwin@FreeBSD.org diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 2da705f42be1..e8b9d2b59343 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -257,20 +257,17 @@ # packages for different Python versions. # default: -py${PYTHON_SUFFIX} # -# Using USES=python also will add some useful entries to SUB_LIST and PLIST_SUB: +# Using USES=python also will add some useful entries to PLIST_SUB: # -# PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR} -# PYTHON_LIBDIR=${PYTHONPREFIX_LIBDIR} +# PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;} +# PYTHON_LIBDIR=${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;} # PYTHON_PLATFORM=${PYTHON_PLATFORM} -# PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR} +# PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} # PYTHON_SUFFIX=${PYTHON_SUFFIX} # PYTHON_VER=${PYTHON_VER} # PYTHON_VERSION=${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: +# and PYTHON2 and PYTHON3 will be set according to the Python version: # # PYTHON2="" PYTHON3="@comment " for Python 2.x # PYTHON2="@comment " PYTHON3="" for Python 3.x @@ -788,16 +785,6 @@ ${_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. @@ -810,10 +797,8 @@ 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/UPDATING b/UPDATING index 3f599f6b93bf..8b85cb1b5efc 100644 --- a/UPDATING +++ b/UPDATING @@ -48,23 +48,6 @@ you update your ports collection, before attempting any port upgrades. # pkg set -o databases/mysql57-server:databases/mysql80-server # pkg upgrade -20230215: - AFFECTS: users of python - AUTHOR: vishwin@FreeBSD.org - - A trigger has been added to the lang/python3* ports to compile, - write and remove bytecode files (.pyc) in site-packages after all - pkg transactions have been completed. pkg will no longer manage - such files directly, as they are meant to be generated after - installation. - - For those ports/packages that still package bytecode, some package - checksum mismatches on those files may occur. This is harmless - and will be rectified. - - Technical details available at: - https://wiki.freebsd.org/Python/CompiledPackages - 20230213: Affects: users of sysutils/nut* AUTHOR: cy@FreeBSD.org diff --git a/lang/python310/Makefile b/lang/python310/Makefile index 4b2aafa07a63..f3c13fc09ffd 100644 --- a/lang/python310/Makefile +++ b/lang/python310/Makefile @@ -1,6 +1,6 @@ PORTNAME= python DISTVERSION= ${PYTHON_DISTVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python MASTER_SITES= PYTHON/ftp/python/${DISTVERSION:C/[a-z].*//} PKGNAMESUFFIX= ${PYTHON_SUFFIX} @@ -15,8 +15,8 @@ LICENSE= PSFL LIB_DEPENDS= libffi.so:devel/libffi -USES= compiler:c11 cpe ncurses pathfix pkgconfig \ - python:${PYTHON_DISTVERSION:R},env readline shebangfix ssl tar:xz trigger +USES= compiler:c11 cpe ncurses pathfix pkgconfig readline \ + shebangfix ssl tar:xz PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -25,7 +25,11 @@ SHEBANG_FILES= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py SHEBANG_FILES+= Lib/test/ziptestdata/exe_with_z64 \ Lib/test/ziptestdata/exe_with_zip \ Lib/test/ziptestdata/header.sh -TRIGGERS= ${PYTHON_VERSION} + +# 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 \ diff --git a/lang/python310/files/python3.10.ucl.in b/lang/python310/files/python3.10.ucl.in deleted file mode 100644 index 63d455839549..000000000000 --- a/lang/python310/files/python3.10.ucl.in +++ /dev/null @@ -1,40 +0,0 @@ -path_glob: "%%PYTHON_SITELIBDIR%%/*" -trigger: { - type: lua - sandbox: false - script: <=> removed stale bytecode " .. bytecode_file) - os.remove(full_path .. "/" .. bytecode_file) - end - end - end - end - local res = pkg.readdir(full_path) - if #res == 0 then - --print(" >=> removed empty directory " .. full_path ) - os.remove(full_path) - end - end - end -end - -print(">=> Cleaning stale bytecode files...") -cleanup("%%PYTHON_SITELIBDIR%%") - -print(">=> Byte-compiling Python source files...") -pkg.exec({"%%PYTHON_VERSION%%", "-m", "compileall", "-q", "-o", "0", "-o", "1", "-o", "2", "%%PYTHON_SITELIBDIR%%"}) -EOS -} diff --git a/lang/python311/Makefile b/lang/python311/Makefile index c1bbfa79002e..96c4215f8b0e 100644 --- a/lang/python311/Makefile +++ b/lang/python311/Makefile @@ -1,6 +1,6 @@ PORTNAME= python DISTVERSION= ${PYTHON_DISTVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python MASTER_SITES= PYTHON/ftp/python/${DISTVERSION:C/[a-z].*//} PKGNAMESUFFIX= ${PYTHON_SUFFIX} @@ -15,8 +15,8 @@ LICENSE= PSFL LIB_DEPENDS= libffi.so:devel/libffi -USES= compiler:c11 cpe ncurses pathfix pkgconfig \ - python:${PYTHON_DISTVERSION:R},env readline shebangfix ssl tar:xz trigger +USES= compiler:c11 cpe ncurses pathfix pkgconfig readline \ + shebangfix ssl tar:xz PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -25,7 +25,11 @@ SHEBANG_FILES= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py SHEBANG_FILES+= Lib/test/ziptestdata/exe_with_z64 \ Lib/test/ziptestdata/exe_with_zip \ Lib/test/ziptestdata/header.sh -TRIGGERS= ${PYTHON_VERSION} + +# 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 \ diff --git a/lang/python311/files/python3.11.ucl.in b/lang/python311/files/python3.11.ucl.in deleted file mode 100644 index 63d455839549..000000000000 --- a/lang/python311/files/python3.11.ucl.in +++ /dev/null @@ -1,40 +0,0 @@ -path_glob: "%%PYTHON_SITELIBDIR%%/*" -trigger: { - type: lua - sandbox: false - script: <=> removed stale bytecode " .. bytecode_file) - os.remove(full_path .. "/" .. bytecode_file) - end - end - end - end - local res = pkg.readdir(full_path) - if #res == 0 then - --print(" >=> removed empty directory " .. full_path ) - os.remove(full_path) - end - end - end -end - -print(">=> Cleaning stale bytecode files...") -cleanup("%%PYTHON_SITELIBDIR%%") - -print(">=> Byte-compiling Python source files...") -pkg.exec({"%%PYTHON_VERSION%%", "-m", "compileall", "-q", "-o", "0", "-o", "1", "-o", "2", "%%PYTHON_SITELIBDIR%%"}) -EOS -} diff --git a/lang/python37/Makefile b/lang/python37/Makefile index 459ebdfd771b..ec98e226f309 100644 --- a/lang/python37/Makefile +++ b/lang/python37/Makefile @@ -1,6 +1,6 @@ PORTNAME= python DISTVERSION= ${PYTHON_DISTVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python MASTER_SITES= PYTHON/ftp/python/${DISTVERSION} PKGNAMESUFFIX= ${PYTHON_SUFFIX} @@ -19,14 +19,17 @@ EXPIRATION_DATE= 2023-06-27 LIB_DEPENDS= libffi.so:devel/libffi \ libmpdec.so:math/mpdecimal -USES= cpe ncurses pathfix pkgconfig python:${PYTHON_DISTVERSION:R},env readline \ - shebangfix ssl tar:xz trigger +USES= cpe ncurses pathfix pkgconfig 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 -TRIGGERS= ${PYTHON_VERSION} + +# 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 diff --git a/lang/python37/files/python3.7.ucl.in b/lang/python37/files/python3.7.ucl.in deleted file mode 100644 index a9ebb18f9c27..000000000000 --- a/lang/python37/files/python3.7.ucl.in +++ /dev/null @@ -1,42 +0,0 @@ -path_glob: "%%PYTHON_SITELIBDIR%%/*" -trigger: { - type: lua - sandbox: false - script: <=> removed stale bytecode " .. bytecode_file) - os.remove(full_path .. "/" .. bytecode_file) - end - end - end - end - local res = pkg.readdir(full_path) - if #res == 0 then - --print(" >=> removed empty directory " .. full_path ) - os.remove(full_path) - end - end - end -end - -print(">=> Cleaning stale bytecode files...") -cleanup("%%PYTHON_SITELIBDIR%%") - -print(">=> Byte-compiling Python source files...") -pkg.exec({"%%PYTHON_VERSION%%", "-m", "compileall", "-q", "%%PYTHON_SITELIBDIR%%"}) -pkg.exec({"%%PYTHON_VERSION%%", "-O", "-m", "compileall", "-q", "%%PYTHON_SITELIBDIR%%"}) -pkg.exec({"%%PYTHON_VERSION%%", "-OO", "-m", "compileall", "-q", "%%PYTHON_SITELIBDIR%%"}) -EOS -} diff --git a/lang/python38/Makefile b/lang/python38/Makefile index 056ff45a8f98..07d227c23956 100644 --- a/lang/python38/Makefile +++ b/lang/python38/Makefile @@ -1,6 +1,6 @@ PORTNAME= python DISTVERSION= ${PYTHON_DISTVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python MASTER_SITES= PYTHON/ftp/python/${DISTVERSION} PKGNAMESUFFIX= ${PYTHON_SUFFIX} @@ -15,8 +15,7 @@ LICENSE= PSFL LIB_DEPENDS= libffi.so:devel/libffi -USES= cpe ncurses pathfix pkgconfig python:${PYTHON_DISTVERSION:R},env readline \ - shebangfix ssl tar:xz trigger +USES= cpe ncurses pathfix pkgconfig readline shebangfix ssl tar:xz PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -25,7 +24,11 @@ SHEBANG_FILES= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py SHEBANG_FILES+= Lib/test/ziptestdata/exe_with_z64 \ Lib/test/ziptestdata/exe_with_zip \ Lib/test/ziptestdata/header.sh -TRIGGERS= ${PYTHON_VERSION} + +# 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 \ diff --git a/lang/python38/files/python3.8.ucl.in b/lang/python38/files/python3.8.ucl.in deleted file mode 100644 index a9ebb18f9c27..000000000000 --- a/lang/python38/files/python3.8.ucl.in +++ /dev/null @@ -1,42 +0,0 @@ -path_glob: "%%PYTHON_SITELIBDIR%%/*" -trigger: { - type: lua - sandbox: false - script: <=> removed stale bytecode " .. bytecode_file) - os.remove(full_path .. "/" .. bytecode_file) - end - end - end - end - local res = pkg.readdir(full_path) - if #res == 0 then - --print(" >=> removed empty directory " .. full_path ) - os.remove(full_path) - end - end - end -end - -print(">=> Cleaning stale bytecode files...") -cleanup("%%PYTHON_SITELIBDIR%%") - -print(">=> Byte-compiling Python source files...") -pkg.exec({"%%PYTHON_VERSION%%", "-m", "compileall", "-q", "%%PYTHON_SITELIBDIR%%"}) -pkg.exec({"%%PYTHON_VERSION%%", "-O", "-m", "compileall", "-q", "%%PYTHON_SITELIBDIR%%"}) -pkg.exec({"%%PYTHON_VERSION%%", "-OO", "-m", "compileall", "-q", "%%PYTHON_SITELIBDIR%%"}) -EOS -} diff --git a/lang/python39/Makefile b/lang/python39/Makefile index a577ab3e0b2e..c93a47e69fc3 100644 --- a/lang/python39/Makefile +++ b/lang/python39/Makefile @@ -1,6 +1,6 @@ PORTNAME= python DISTVERSION= ${PYTHON_DISTVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python MASTER_SITES= PYTHON/ftp/python/${DISTVERSION} PKGNAMESUFFIX= ${PYTHON_SUFFIX} @@ -15,8 +15,8 @@ LICENSE= PSFL LIB_DEPENDS= libffi.so:devel/libffi -USES= compiler:c11 cpe ncurses pathfix pkgconfig \ - python:${PYTHON_DISTVERSION:R},env readline shebangfix ssl tar:xz trigger +USES= compiler:c11 cpe ncurses pathfix pkgconfig readline \ + shebangfix ssl tar:xz PATHFIX_MAKEFILEIN= Makefile.pre.in USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -25,7 +25,11 @@ SHEBANG_FILES= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py SHEBANG_FILES+= Lib/test/ziptestdata/exe_with_z64 \ Lib/test/ziptestdata/exe_with_zip \ Lib/test/ziptestdata/header.sh -TRIGGERS= ${PYTHON_VERSION} + +# 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 \ diff --git a/lang/python39/files/python3.9.ucl.in b/lang/python39/files/python3.9.ucl.in deleted file mode 100644 index 63d455839549..000000000000 --- a/lang/python39/files/python3.9.ucl.in +++ /dev/null @@ -1,40 +0,0 @@ -path_glob: "%%PYTHON_SITELIBDIR%%/*" -trigger: { - type: lua - sandbox: false - script: <=> removed stale bytecode " .. bytecode_file) - os.remove(full_path .. "/" .. bytecode_file) - end - end - end - end - local res = pkg.readdir(full_path) - if #res == 0 then - --print(" >=> removed empty directory " .. full_path ) - os.remove(full_path) - end - end - end -end - -print(">=> Cleaning stale bytecode files...") -cleanup("%%PYTHON_SITELIBDIR%%") - -print(">=> Byte-compiling Python source files...") -pkg.exec({"%%PYTHON_VERSION%%", "-m", "compileall", "-q", "-o", "0", "-o", "1", "-o", "2", "%%PYTHON_SITELIBDIR%%"}) -EOS -}