Received: by mail.netbsd.org (Postfix, from userid 605) id 4047B84D48; Fri, 14 Aug 2020 19:28:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BB8B884CEE for ; Fri, 14 Aug 2020 19:28:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id mZ23uszyWmSs for ; Fri, 14 Aug 2020 19:28:45 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 053C384CE7 for ; Fri, 14 Aug 2020 19:28:45 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id F32AAFB28; Fri, 14 Aug 2020 19:28:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1597433324202820" MIME-Version: 1.0 Date: Fri, 14 Aug 2020 19:28:44 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/lang To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20200814192844.F32AAFB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1597433324202820 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Fri Aug 14 19:28:44 UTC 2020 Modified Files: pkgsrc/lang/python27: Makefile distinfo pkgsrc/lang/python36: Makefile distinfo pkgsrc/lang/python37: Makefile distinfo pkgsrc/lang/python38: Makefile distinfo Added Files: pkgsrc/lang/python27/patches: patch-Lib_lib2to3_pgen2_driver.py pkgsrc/lang/python36/patches: patch-Lib_lib2to3_pgen2_driver.py pkgsrc/lang/python37/patches: patch-Lib_lib2to3_pgen2_driver.py pkgsrc/lang/python38/patches: patch-Lib_lib2to3_pgen2_driver.py Log Message: 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. For platforms that weren't having this problem, no functional change intended. For platforms that were, this simply restores "make package", so no PKGREVISION bump. To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 pkgsrc/lang/python27/Makefile cvs rdiff -u -r1.73 -r1.74 pkgsrc/lang/python27/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/lang/python27/patches/patch-Lib_lib2to3_pgen2_driver.py cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/python36/Makefile cvs rdiff -u -r1.30 -r1.31 pkgsrc/lang/python36/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/lang/python36/patches/patch-Lib_lib2to3_pgen2_driver.py cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/python37/Makefile cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/python37/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/lang/python37/patches/patch-Lib_lib2to3_pgen2_driver.py cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/python38/Makefile cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/python38/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/lang/python38/patches/patch-Lib_lib2to3_pgen2_driver.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1597433324202820 Content-Disposition: inline Content-Length: 13672 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/python27/Makefile diff -u pkgsrc/lang/python27/Makefile:1.85 pkgsrc/lang/python27/Makefile:1.86 --- pkgsrc/lang/python27/Makefile:1.85 Thu May 21 17:25:13 2020 +++ pkgsrc/lang/python27/Makefile Fri Aug 14 19:28:43 2020 @@ -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,${PR 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 Index: pkgsrc/lang/python27/distinfo diff -u pkgsrc/lang/python27/distinfo:1.73 pkgsrc/lang/python27/distinfo:1.74 --- pkgsrc/lang/python27/distinfo:1.73 Mon Apr 20 20:05:56 2020 +++ pkgsrc/lang/python27/distinfo Fri Aug 14 19:28:43 2020 @@ -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_ 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 Index: pkgsrc/lang/python36/Makefile diff -u pkgsrc/lang/python36/Makefile:1.25 pkgsrc/lang/python36/Makefile:1.26 --- pkgsrc/lang/python36/Makefile:1.25 Tue Jun 30 05:59:40 2020 +++ pkgsrc/lang/python36/Makefile Fri Aug 14 19:28:44 2020 @@ -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,${PR 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 Index: pkgsrc/lang/python36/distinfo diff -u pkgsrc/lang/python36/distinfo:1.30 pkgsrc/lang/python36/distinfo:1.31 --- pkgsrc/lang/python36/distinfo:1.30 Tue Jun 30 05:59:40 2020 +++ pkgsrc/lang/python36/distinfo Fri Aug 14 19:28:44 2020 @@ -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) = 3b7aec 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 Index: pkgsrc/lang/python37/Makefile diff -u pkgsrc/lang/python37/Makefile:1.18 pkgsrc/lang/python37/Makefile:1.19 --- pkgsrc/lang/python37/Makefile:1.18 Mon Aug 3 11:11:33 2020 +++ pkgsrc/lang/python37/Makefile Fri Aug 14 19:28:44 2020 @@ -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,${PR 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 Index: pkgsrc/lang/python37/distinfo diff -u pkgsrc/lang/python37/distinfo:1.17 pkgsrc/lang/python37/distinfo:1.18 --- pkgsrc/lang/python37/distinfo:1.17 Mon Aug 3 11:11:33 2020 +++ pkgsrc/lang/python37/distinfo Fri Aug 14 19:28:44 2020 @@ -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_instal 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 Index: pkgsrc/lang/python38/Makefile diff -u pkgsrc/lang/python38/Makefile:1.12 pkgsrc/lang/python38/Makefile:1.13 --- pkgsrc/lang/python38/Makefile:1.12 Tue Jul 14 19:12:31 2020 +++ pkgsrc/lang/python38/Makefile Fri Aug 14 19:28:44 2020 @@ -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,${PR 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 Index: pkgsrc/lang/python38/distinfo diff -u pkgsrc/lang/python38/distinfo:1.9 pkgsrc/lang/python38/distinfo:1.10 --- pkgsrc/lang/python38/distinfo:1.9 Tue Jul 21 16:31:15 2020 +++ pkgsrc/lang/python38/distinfo Fri Aug 14 19:28:44 2020 @@ -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) = 032cc9 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 Added files: Index: pkgsrc/lang/python27/patches/patch-Lib_lib2to3_pgen2_driver.py diff -u /dev/null pkgsrc/lang/python27/patches/patch-Lib_lib2to3_pgen2_driver.py:1.1 --- /dev/null Fri Aug 14 19:28:44 2020 +++ pkgsrc/lang/python27/patches/patch-Lib_lib2to3_pgen2_driver.py Fri Aug 14 19:28:44 2020 @@ -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, Index: pkgsrc/lang/python36/patches/patch-Lib_lib2to3_pgen2_driver.py diff -u /dev/null pkgsrc/lang/python36/patches/patch-Lib_lib2to3_pgen2_driver.py:1.1 --- /dev/null Fri Aug 14 19:28:44 2020 +++ pkgsrc/lang/python36/patches/patch-Lib_lib2to3_pgen2_driver.py Fri Aug 14 19:28:44 2020 @@ -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, Index: pkgsrc/lang/python37/patches/patch-Lib_lib2to3_pgen2_driver.py diff -u /dev/null pkgsrc/lang/python37/patches/patch-Lib_lib2to3_pgen2_driver.py:1.1 --- /dev/null Fri Aug 14 19:28:44 2020 +++ pkgsrc/lang/python37/patches/patch-Lib_lib2to3_pgen2_driver.py Fri Aug 14 19:28:44 2020 @@ -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, Index: pkgsrc/lang/python38/patches/patch-Lib_lib2to3_pgen2_driver.py diff -u /dev/null pkgsrc/lang/python38/patches/patch-Lib_lib2to3_pgen2_driver.py:1.1 --- /dev/null Fri Aug 14 19:28:44 2020 +++ pkgsrc/lang/python38/patches/patch-Lib_lib2to3_pgen2_driver.py Fri Aug 14 19:28:44 2020 @@ -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, --_----------=_1597433324202820--