summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/python27/Makefile7
-rw-r--r--lang/python27/distinfo3
-rw-r--r--lang/python27/patches/patch-Lib_lib2to3_pgen2_driver.py28
-rw-r--r--lang/python36/Makefile7
-rw-r--r--lang/python36/distinfo3
-rw-r--r--lang/python36/patches/patch-Lib_lib2to3_pgen2_driver.py28
-rw-r--r--lang/python37/Makefile7
-rw-r--r--lang/python37/distinfo3
-rw-r--r--lang/python37/patches/patch-Lib_lib2to3_pgen2_driver.py28
-rw-r--r--lang/python38/Makefile7
-rw-r--r--lang/python38/distinfo3
-rw-r--r--lang/python38/patches/patch-Lib_lib2to3_pgen2_driver.py28
12 files changed, 144 insertions, 8 deletions
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index a0af4911452..b8bbe2df26b 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2020/05/21 17:25:13 leot Exp $
+# $NetBSD: Makefile,v 1.86 2020/08/14 19:28:43 schmonz Exp $
.include "dist.mk"
@@ -181,6 +181,11 @@ SUBST_SED.findlib= -e 's,/usr/local,${PREFIX},'
SUBST_SED.findlib+= -e 's!\(-Wl,-t -o\)!${COMPILER_RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib \1!'
SUBST_NOOP_OK.findlib= yes
+SUBST_CLASSES+= pkgversion
+SUBST_STAGE.pkgversion= pre-configure
+SUBST_FILES.pkgversion= Lib/lib2to3/pgen2/driver.py
+SUBST_VARS.pkgversion= PKGVERSION_NOREV
+
.include "options.mk"
SUBST_CLASSES+= sslbase
diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index 1540621e122..abba8806012 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.73 2020/04/20 20:05:56 adam Exp $
+$NetBSD: distinfo,v 1.74 2020/08/14 19:28:43 schmonz Exp $
SHA1 (Python-2.7.18.tar.xz) = 678d4cf483a1c92efd347ee8e1e79326dc82810b
RMD160 (Python-2.7.18.tar.xz) = 40a514bb05c9e631454ea8466e28f5bb229428ad
@@ -11,6 +11,7 @@ SHA1 (patch-Lib_distutils_command_build__ext.py) = ea4feba4e93dbcff07050c82a00d5
SHA1 (patch-Lib_distutils_command_install.py) = e6aef090b444b455fe351308d251e670329b7dc3
SHA1 (patch-Lib_distutils_unixccompiler.py) = db16c9aca2f29730945f28247b88b18828739bbb
SHA1 (patch-Lib_distutils_util.py) = 5bcfad96f8e490351160f1a7c1f4ece7706a33fa
+SHA1 (patch-Lib_lib2to3_pgen2_driver.py) = abe876142a20e60a3c0a0cf80abeecf54855c07c
SHA1 (patch-Lib_multiprocessing_process.py) = 15699bd8ec822bf54a0631102e00e0a34f882803
SHA1 (patch-Lib_plistlib.py) = 96ae702995d434e2d7ec0ac62e37427a90b61d13
SHA1 (patch-Lib_sysconfig.py) = 8a7a0e5cbfec279a05945dffafea1b1131a76f0e
diff --git a/lang/python27/patches/patch-Lib_lib2to3_pgen2_driver.py b/lang/python27/patches/patch-Lib_lib2to3_pgen2_driver.py
new file mode 100644
index 00000000000..f50bc3c3107
--- /dev/null
+++ b/lang/python27/patches/patch-Lib_lib2to3_pgen2_driver.py
@@ -0,0 +1,28 @@
+$NetBSD: patch-Lib_lib2to3_pgen2_driver.py,v 1.1 2020/08/14 19:28:44 schmonz Exp $
+
+On systems where both of the conditions
+
+1. LD_LIBRARY_PATH does _not_ take precedence over DT_RPATH
+ (e.g. Linux)
+2. A previous libpython with the same major.minor is already installed
+ (e.g. a previous version of this package)
+
+hold, the built python will be linked with the installed libpython,
+causing it to report an old teeny version in sys.version_info while
+staging the install. Then "make package" fails with PLIST mismatches for
+{,Pattern}Grammar.*.pickle.
+
+pkgsrc knows which version we're building. Pass that down instead.
+
+--- Lib/lib2to3/pgen2/driver.py.orig 2020-06-27 08:35:53.000000000 +0000
++++ Lib/lib2to3/pgen2/driver.py
+@@ -108,7 +108,8 @@ def _generate_pickle_name(gt):
+ head, tail = os.path.splitext(gt)
+ if tail == ".txt":
+ tail = ""
+- return head + tail + ".".join(map(str, sys.version_info)) + ".pickle"
++ sys_version_info = "@PKGVERSION_NOREV@" + ".final.0"
++ return head + tail + sys_version_info + ".pickle"
+
+
+ def load_grammar(gt="Grammar.txt", gp=None,
diff --git a/lang/python36/Makefile b/lang/python36/Makefile
index f68b850ab9a..3757bb50765 100644
--- a/lang/python36/Makefile
+++ b/lang/python36/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2020/06/30 05:59:40 adam Exp $
+# $NetBSD: Makefile,v 1.26 2020/08/14 19:28:44 schmonz Exp $
.include "dist.mk"
@@ -158,6 +158,11 @@ SUBST_SED.findlib= -e 's,/usr/local,${PREFIX},'
SUBST_SED.findlib+= -e "s!\('-Wl,-t'\)!'${COMPILER_RPATH_FLAG}${PREFIX}/lib', '-L${PREFIX}/lib', \1!"
SUBST_NOOP_OK.findlib= yes
+SUBST_CLASSES+= pkgversion
+SUBST_STAGE.pkgversion= pre-configure
+SUBST_FILES.pkgversion= Lib/lib2to3/pgen2/driver.py
+SUBST_VARS.pkgversion= PKGVERSION_NOREV
+
.include "options.mk"
SUBST_CLASSES+= sslbase
diff --git a/lang/python36/distinfo b/lang/python36/distinfo
index ac325ec2145..c678b529294 100644
--- a/lang/python36/distinfo
+++ b/lang/python36/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2020/06/30 05:59:40 adam Exp $
+$NetBSD: distinfo,v 1.31 2020/08/14 19:28:44 schmonz Exp $
SHA1 (Python-3.6.11.tar.xz) = 0840e6b726446fccaef483dad84cce8fdc683077
RMD160 (Python-3.6.11.tar.xz) = d1577bbfb4fb6b9c47389383e2b5ff9abb7db9e3
@@ -8,6 +8,7 @@ SHA1 (patch-Lib_ctypes_util.py) = 3b7aecb2879cce70c76bd4bc60f2ec577a5bed61
SHA1 (patch-Lib_distutils_command_install.py) = 29204f34296f36ab2b21c745f915ba73caf2b71c
SHA1 (patch-Lib_distutils_sysconfig.py) = 6822eafb4dfded86d7f7353831816aeb8119e6cf
SHA1 (patch-Lib_distutils_unixccompiler.py) = e7aa684fa186de7a01486c3d8bfa177afdd22ef9
+SHA1 (patch-Lib_lib2to3_pgen2_driver.py) = abe876142a20e60a3c0a0cf80abeecf54855c07c
SHA1 (patch-Lib_sysconfig.py) = a4f009ed73ebbd9d9c4bf7e12b7981182ed8fd7c
SHA1 (patch-Makefile.pre.in) = b7f2512a8253ebf4c3ca8742a37736bfd8bd52d8
SHA1 (patch-Modules_makesetup) = a06786eebffadecedba5e3a50a9785fb47613567
diff --git a/lang/python36/patches/patch-Lib_lib2to3_pgen2_driver.py b/lang/python36/patches/patch-Lib_lib2to3_pgen2_driver.py
new file mode 100644
index 00000000000..f50bc3c3107
--- /dev/null
+++ b/lang/python36/patches/patch-Lib_lib2to3_pgen2_driver.py
@@ -0,0 +1,28 @@
+$NetBSD: patch-Lib_lib2to3_pgen2_driver.py,v 1.1 2020/08/14 19:28:44 schmonz Exp $
+
+On systems where both of the conditions
+
+1. LD_LIBRARY_PATH does _not_ take precedence over DT_RPATH
+ (e.g. Linux)
+2. A previous libpython with the same major.minor is already installed
+ (e.g. a previous version of this package)
+
+hold, the built python will be linked with the installed libpython,
+causing it to report an old teeny version in sys.version_info while
+staging the install. Then "make package" fails with PLIST mismatches for
+{,Pattern}Grammar.*.pickle.
+
+pkgsrc knows which version we're building. Pass that down instead.
+
+--- Lib/lib2to3/pgen2/driver.py.orig 2020-06-27 08:35:53.000000000 +0000
++++ Lib/lib2to3/pgen2/driver.py
+@@ -108,7 +108,8 @@ def _generate_pickle_name(gt):
+ head, tail = os.path.splitext(gt)
+ if tail == ".txt":
+ tail = ""
+- return head + tail + ".".join(map(str, sys.version_info)) + ".pickle"
++ sys_version_info = "@PKGVERSION_NOREV@" + ".final.0"
++ return head + tail + sys_version_info + ".pickle"
+
+
+ def load_grammar(gt="Grammar.txt", gp=None,
diff --git a/lang/python37/Makefile b/lang/python37/Makefile
index 59502b581e9..93d65bfdf88 100644
--- a/lang/python37/Makefile
+++ b/lang/python37/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2020/08/03 11:11:33 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2020/08/14 19:28:44 schmonz Exp $
.include "dist.mk"
@@ -158,6 +158,11 @@ SUBST_SED.findlib= -e 's,/usr/local,${PREFIX},'
SUBST_SED.findlib+= -e "s!\('-Wl,-t'\)!'${COMPILER_RPATH_FLAG}${PREFIX}/lib', '-L${PREFIX}/lib', \1!"
SUBST_NOOP_OK.findlib= yes
+SUBST_CLASSES+= pkgversion
+SUBST_STAGE.pkgversion= pre-configure
+SUBST_FILES.pkgversion= Lib/lib2to3/pgen2/driver.py
+SUBST_VARS.pkgversion= PKGVERSION_NOREV
+
.include "options.mk"
CHECK_INTERPRETER_SKIP= lib/python${PY_VER_SUFFIX}/venv/scripts/posix/pydoc
diff --git a/lang/python37/distinfo b/lang/python37/distinfo
index 80d561695d5..6daa30f8205 100644
--- a/lang/python37/distinfo
+++ b/lang/python37/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2020/08/03 11:11:33 wiz Exp $
+$NetBSD: distinfo,v 1.18 2020/08/14 19:28:44 schmonz Exp $
SHA1 (Python-3.7.8.tar.xz) = ecfc1d291ab35bb7cc3a352dd9451450266f5974
RMD160 (Python-3.7.8.tar.xz) = 67af3c8cbdfbadd49bbbb56690b3da90799dc687
@@ -9,6 +9,7 @@ SHA1 (patch-Lib_distutils_command_install.py) = 6fc6f5d918b7581fc62cd0fe55857ee9
SHA1 (patch-Lib_distutils_sysconfig.py) = 6822eafb4dfded86d7f7353831816aeb8119e6cf
SHA1 (patch-Lib_distutils_unixccompiler.py) = 2e65a8dd5dd3fe25957206c062106fa7a6fc4e69
SHA1 (patch-Lib_ipaddress.py) = cf3a5f76567875e74461fd87d6089494000611dc
+SHA1 (patch-Lib_lib2to3_pgen2_driver.py) = abe876142a20e60a3c0a0cf80abeecf54855c07c
SHA1 (patch-Lib_sysconfig.py) = a4f009ed73ebbd9d9c4bf7e12b7981182ed8fd7c
SHA1 (patch-Lib_test_test__ipaddress.py) = b7b5cf9445c5fb1e20d957e7a271802ad4854ab1
SHA1 (patch-Makefile.pre.in) = 1393dac225c5a7edcb7947eb707b4526ea884f95
diff --git a/lang/python37/patches/patch-Lib_lib2to3_pgen2_driver.py b/lang/python37/patches/patch-Lib_lib2to3_pgen2_driver.py
new file mode 100644
index 00000000000..f50bc3c3107
--- /dev/null
+++ b/lang/python37/patches/patch-Lib_lib2to3_pgen2_driver.py
@@ -0,0 +1,28 @@
+$NetBSD: patch-Lib_lib2to3_pgen2_driver.py,v 1.1 2020/08/14 19:28:44 schmonz Exp $
+
+On systems where both of the conditions
+
+1. LD_LIBRARY_PATH does _not_ take precedence over DT_RPATH
+ (e.g. Linux)
+2. A previous libpython with the same major.minor is already installed
+ (e.g. a previous version of this package)
+
+hold, the built python will be linked with the installed libpython,
+causing it to report an old teeny version in sys.version_info while
+staging the install. Then "make package" fails with PLIST mismatches for
+{,Pattern}Grammar.*.pickle.
+
+pkgsrc knows which version we're building. Pass that down instead.
+
+--- Lib/lib2to3/pgen2/driver.py.orig 2020-06-27 08:35:53.000000000 +0000
++++ Lib/lib2to3/pgen2/driver.py
+@@ -108,7 +108,8 @@ def _generate_pickle_name(gt):
+ head, tail = os.path.splitext(gt)
+ if tail == ".txt":
+ tail = ""
+- return head + tail + ".".join(map(str, sys.version_info)) + ".pickle"
++ sys_version_info = "@PKGVERSION_NOREV@" + ".final.0"
++ return head + tail + sys_version_info + ".pickle"
+
+
+ def load_grammar(gt="Grammar.txt", gp=None,
diff --git a/lang/python38/Makefile b/lang/python38/Makefile
index f6f4ab70d58..1fa8429e907 100644
--- a/lang/python38/Makefile
+++ b/lang/python38/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/07/14 19:12:31 adam Exp $
+# $NetBSD: Makefile,v 1.13 2020/08/14 19:28:44 schmonz Exp $
.include "dist.mk"
@@ -158,6 +158,11 @@ SUBST_SED.findlib= -e 's,/usr/local,${PREFIX},'
SUBST_SED.findlib+= -e "s!\('-Wl,-t'\)!'${COMPILER_RPATH_FLAG}${PREFIX}/lib', '-L${PREFIX}/lib', \1!"
SUBST_NOOP_OK.findlib= yes
+SUBST_CLASSES+= pkgversion
+SUBST_STAGE.pkgversion= pre-configure
+SUBST_FILES.pkgversion= Lib/lib2to3/pgen2/driver.py
+SUBST_VARS.pkgversion= PKGVERSION_NOREV
+
.include "options.mk"
CHECK_INTERPRETER_SKIP= lib/python${PY_VER_SUFFIX}/venv/scripts/posix/pydoc
diff --git a/lang/python38/distinfo b/lang/python38/distinfo
index 998272ffe5b..28f8727bdbe 100644
--- a/lang/python38/distinfo
+++ b/lang/python38/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2020/07/21 16:31:15 adam Exp $
+$NetBSD: distinfo,v 1.10 2020/08/14 19:28:44 schmonz Exp $
SHA1 (Python-3.8.5.tar.xz) = 68d6c7f948801cc755905162f5ee7589595edee4
RMD160 (Python-3.8.5.tar.xz) = e39eafd2303fa8dc59c16ad5d987c7bc035236a8
@@ -8,6 +8,7 @@ SHA1 (patch-Lib_ctypes_util.py) = 032cc99ebad93ddddfd89073c60424a952e3faa3
SHA1 (patch-Lib_distutils_command_install.py) = 6fc6f5d918b7581fc62cd0fe55857ee932c3a341
SHA1 (patch-Lib_distutils_sysconfig.py) = 6822eafb4dfded86d7f7353831816aeb8119e6cf
SHA1 (patch-Lib_distutils_unixccompiler.py) = 2e65a8dd5dd3fe25957206c062106fa7a6fc4e69
+SHA1 (patch-Lib_lib2to3_pgen2_driver.py) = abe876142a20e60a3c0a0cf80abeecf54855c07c
SHA1 (patch-Lib_sysconfig.py) = a4f009ed73ebbd9d9c4bf7e12b7981182ed8fd7c
SHA1 (patch-Makefile.pre.in) = d42f9f5bca1dd663f64122dc95b49111452fe6e8
SHA1 (patch-Modules_makesetup) = a06786eebffadecedba5e3a50a9785fb47613567
diff --git a/lang/python38/patches/patch-Lib_lib2to3_pgen2_driver.py b/lang/python38/patches/patch-Lib_lib2to3_pgen2_driver.py
new file mode 100644
index 00000000000..f50bc3c3107
--- /dev/null
+++ b/lang/python38/patches/patch-Lib_lib2to3_pgen2_driver.py
@@ -0,0 +1,28 @@
+$NetBSD: patch-Lib_lib2to3_pgen2_driver.py,v 1.1 2020/08/14 19:28:44 schmonz Exp $
+
+On systems where both of the conditions
+
+1. LD_LIBRARY_PATH does _not_ take precedence over DT_RPATH
+ (e.g. Linux)
+2. A previous libpython with the same major.minor is already installed
+ (e.g. a previous version of this package)
+
+hold, the built python will be linked with the installed libpython,
+causing it to report an old teeny version in sys.version_info while
+staging the install. Then "make package" fails with PLIST mismatches for
+{,Pattern}Grammar.*.pickle.
+
+pkgsrc knows which version we're building. Pass that down instead.
+
+--- Lib/lib2to3/pgen2/driver.py.orig 2020-06-27 08:35:53.000000000 +0000
++++ Lib/lib2to3/pgen2/driver.py
+@@ -108,7 +108,8 @@ def _generate_pickle_name(gt):
+ head, tail = os.path.splitext(gt)
+ if tail == ".txt":
+ tail = ""
+- return head + tail + ".".join(map(str, sys.version_info)) + ".pickle"
++ sys_version_info = "@PKGVERSION_NOREV@" + ".final.0"
++ return head + tail + sys_version_info + ".pickle"
+
+
+ def load_grammar(gt="Grammar.txt", gp=None,
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-03 11:09:23 +0000