Received: by mail.netbsd.org (Postfix, from userid 605) id A870C84D6A; Sat, 15 Aug 2020 12:35:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 307F584CEE for ; Sat, 15 Aug 2020 12:35:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id m3gpMtcp5oXG for ; Sat, 15 Aug 2020 12:35:58 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 4071384CE2 for ; Sat, 15 Aug 2020 12:35:58 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 332E8FB28; Sat, 15 Aug 2020 12:35:58 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_159749495893830" MIME-Version: 1.0 Date: Sat, 15 Aug 2020 12:35:58 +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: <20200815123558.332E8FB28@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. --_----------=_159749495893830 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Sat Aug 15 12:35:58 UTC 2020 Modified Files: pkgsrc/lang/python27: distinfo pkgsrc/lang/python27/patches: patch-Lib_lib2to3_pgen2_driver.py pkgsrc/lang/python36: distinfo pkgsrc/lang/python36/patches: patch-Lib_lib2to3_pgen2_driver.py pkgsrc/lang/python37: distinfo pkgsrc/lang/python37/patches: patch-Lib_lib2to3_pgen2_driver.py pkgsrc/lang/python38: distinfo pkgsrc/lang/python38/patches: patch-Lib_lib2to3_pgen2_driver.py Log Message: Note that the need for this patch appears self-induced. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 pkgsrc/lang/python27/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/lang/python27/patches/patch-Lib_lib2to3_pgen2_driver.py cvs rdiff -u -r1.31 -r1.32 pkgsrc/lang/python36/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/lang/python36/patches/patch-Lib_lib2to3_pgen2_driver.py cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/python37/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/lang/python37/patches/patch-Lib_lib2to3_pgen2_driver.py cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/python38/distinfo cvs rdiff -u -r1.1 -r1.2 \ 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. --_----------=_159749495893830 Content-Disposition: inline Content-Length: 9497 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/python27/distinfo diff -u pkgsrc/lang/python27/distinfo:1.74 pkgsrc/lang/python27/distinfo:1.75 --- pkgsrc/lang/python27/distinfo:1.74 Fri Aug 14 19:28:43 2020 +++ pkgsrc/lang/python27/distinfo Sat Aug 15 12:35:56 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.74 2020/08/14 19:28:43 schmonz Exp $ +$NetBSD: distinfo,v 1.75 2020/08/15 12:35:56 schmonz Exp $ SHA1 (Python-2.7.18.tar.xz) = 678d4cf483a1c92efd347ee8e1e79326dc82810b RMD160 (Python-2.7.18.tar.xz) = 40a514bb05c9e631454ea8466e28f5bb229428ad @@ -11,7 +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_lib2to3_pgen2_driver.py) = 5d6dab14197f27363394ff1aeee22a8ced8026d2 SHA1 (patch-Lib_multiprocessing_process.py) = 15699bd8ec822bf54a0631102e00e0a34f882803 SHA1 (patch-Lib_plistlib.py) = 96ae702995d434e2d7ec0ac62e37427a90b61d13 SHA1 (patch-Lib_sysconfig.py) = 8a7a0e5cbfec279a05945dffafea1b1131a76f0e Index: pkgsrc/lang/python27/patches/patch-Lib_lib2to3_pgen2_driver.py diff -u pkgsrc/lang/python27/patches/patch-Lib_lib2to3_pgen2_driver.py:1.1 pkgsrc/lang/python27/patches/patch-Lib_lib2to3_pgen2_driver.py:1.2 --- pkgsrc/lang/python27/patches/patch-Lib_lib2to3_pgen2_driver.py:1.1 Fri Aug 14 19:28:44 2020 +++ pkgsrc/lang/python27/patches/patch-Lib_lib2to3_pgen2_driver.py Sat Aug 15 12:35:57 2020 @@ -1,4 +1,4 @@ -$NetBSD: patch-Lib_lib2to3_pgen2_driver.py,v 1.1 2020/08/14 19:28:44 schmonz Exp $ +$NetBSD: patch-Lib_lib2to3_pgen2_driver.py,v 1.2 2020/08/15 12:35:57 schmonz Exp $ On systems where both of the conditions @@ -14,6 +14,10 @@ staging the install. Then "make package" pkgsrc knows which version we're building. Pass that down instead. +In patch-Lib_distutils_unixccompiler.py, we override Python maintainers' +expectations for Linux builds in favor of pkgsrc's expectations for +builds on all platforms. This patch is needed because of that patch. + --- 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): Index: pkgsrc/lang/python36/distinfo diff -u pkgsrc/lang/python36/distinfo:1.31 pkgsrc/lang/python36/distinfo:1.32 --- pkgsrc/lang/python36/distinfo:1.31 Fri Aug 14 19:28:44 2020 +++ pkgsrc/lang/python36/distinfo Sat Aug 15 12:35:57 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.31 2020/08/14 19:28:44 schmonz Exp $ +$NetBSD: distinfo,v 1.32 2020/08/15 12:35:57 schmonz Exp $ SHA1 (Python-3.6.11.tar.xz) = 0840e6b726446fccaef483dad84cce8fdc683077 RMD160 (Python-3.6.11.tar.xz) = d1577bbfb4fb6b9c47389383e2b5ff9abb7db9e3 @@ -8,7 +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_lib2to3_pgen2_driver.py) = 5d6dab14197f27363394ff1aeee22a8ced8026d2 SHA1 (patch-Lib_sysconfig.py) = a4f009ed73ebbd9d9c4bf7e12b7981182ed8fd7c SHA1 (patch-Makefile.pre.in) = b7f2512a8253ebf4c3ca8742a37736bfd8bd52d8 SHA1 (patch-Modules_makesetup) = a06786eebffadecedba5e3a50a9785fb47613567 Index: pkgsrc/lang/python36/patches/patch-Lib_lib2to3_pgen2_driver.py diff -u pkgsrc/lang/python36/patches/patch-Lib_lib2to3_pgen2_driver.py:1.1 pkgsrc/lang/python36/patches/patch-Lib_lib2to3_pgen2_driver.py:1.2 --- pkgsrc/lang/python36/patches/patch-Lib_lib2to3_pgen2_driver.py:1.1 Fri Aug 14 19:28:44 2020 +++ pkgsrc/lang/python36/patches/patch-Lib_lib2to3_pgen2_driver.py Sat Aug 15 12:35:57 2020 @@ -1,4 +1,4 @@ -$NetBSD: patch-Lib_lib2to3_pgen2_driver.py,v 1.1 2020/08/14 19:28:44 schmonz Exp $ +$NetBSD: patch-Lib_lib2to3_pgen2_driver.py,v 1.2 2020/08/15 12:35:57 schmonz Exp $ On systems where both of the conditions @@ -14,6 +14,10 @@ staging the install. Then "make package" pkgsrc knows which version we're building. Pass that down instead. +In patch-Lib_distutils_unixccompiler.py, we override Python maintainers' +expectations for Linux builds in favor of pkgsrc's expectations for +builds on all platforms. This patch is needed because of that patch. + --- 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): Index: pkgsrc/lang/python37/distinfo diff -u pkgsrc/lang/python37/distinfo:1.18 pkgsrc/lang/python37/distinfo:1.19 --- pkgsrc/lang/python37/distinfo:1.18 Fri Aug 14 19:28:44 2020 +++ pkgsrc/lang/python37/distinfo Sat Aug 15 12:35:57 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2020/08/14 19:28:44 schmonz Exp $ +$NetBSD: distinfo,v 1.19 2020/08/15 12:35:57 schmonz Exp $ SHA1 (Python-3.7.8.tar.xz) = ecfc1d291ab35bb7cc3a352dd9451450266f5974 RMD160 (Python-3.7.8.tar.xz) = 67af3c8cbdfbadd49bbbb56690b3da90799dc687 @@ -9,7 +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_lib2to3_pgen2_driver.py) = 5d6dab14197f27363394ff1aeee22a8ced8026d2 SHA1 (patch-Lib_sysconfig.py) = a4f009ed73ebbd9d9c4bf7e12b7981182ed8fd7c SHA1 (patch-Lib_test_test__ipaddress.py) = b7b5cf9445c5fb1e20d957e7a271802ad4854ab1 SHA1 (patch-Makefile.pre.in) = 1393dac225c5a7edcb7947eb707b4526ea884f95 Index: pkgsrc/lang/python37/patches/patch-Lib_lib2to3_pgen2_driver.py diff -u pkgsrc/lang/python37/patches/patch-Lib_lib2to3_pgen2_driver.py:1.1 pkgsrc/lang/python37/patches/patch-Lib_lib2to3_pgen2_driver.py:1.2 --- pkgsrc/lang/python37/patches/patch-Lib_lib2to3_pgen2_driver.py:1.1 Fri Aug 14 19:28:44 2020 +++ pkgsrc/lang/python37/patches/patch-Lib_lib2to3_pgen2_driver.py Sat Aug 15 12:35:57 2020 @@ -1,4 +1,4 @@ -$NetBSD: patch-Lib_lib2to3_pgen2_driver.py,v 1.1 2020/08/14 19:28:44 schmonz Exp $ +$NetBSD: patch-Lib_lib2to3_pgen2_driver.py,v 1.2 2020/08/15 12:35:57 schmonz Exp $ On systems where both of the conditions @@ -14,6 +14,10 @@ staging the install. Then "make package" pkgsrc knows which version we're building. Pass that down instead. +In patch-Lib_distutils_unixccompiler.py, we override Python maintainers' +expectations for Linux builds in favor of pkgsrc's expectations for +builds on all platforms. This patch is needed because of that patch. + --- 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): Index: pkgsrc/lang/python38/distinfo diff -u pkgsrc/lang/python38/distinfo:1.10 pkgsrc/lang/python38/distinfo:1.11 --- pkgsrc/lang/python38/distinfo:1.10 Fri Aug 14 19:28:44 2020 +++ pkgsrc/lang/python38/distinfo Sat Aug 15 12:35:57 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2020/08/14 19:28:44 schmonz Exp $ +$NetBSD: distinfo,v 1.11 2020/08/15 12:35:57 schmonz Exp $ SHA1 (Python-3.8.5.tar.xz) = 68d6c7f948801cc755905162f5ee7589595edee4 RMD160 (Python-3.8.5.tar.xz) = e39eafd2303fa8dc59c16ad5d987c7bc035236a8 @@ -8,7 +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_lib2to3_pgen2_driver.py) = 5d6dab14197f27363394ff1aeee22a8ced8026d2 SHA1 (patch-Lib_sysconfig.py) = a4f009ed73ebbd9d9c4bf7e12b7981182ed8fd7c SHA1 (patch-Makefile.pre.in) = d42f9f5bca1dd663f64122dc95b49111452fe6e8 SHA1 (patch-Modules_makesetup) = a06786eebffadecedba5e3a50a9785fb47613567 Index: pkgsrc/lang/python38/patches/patch-Lib_lib2to3_pgen2_driver.py diff -u pkgsrc/lang/python38/patches/patch-Lib_lib2to3_pgen2_driver.py:1.1 pkgsrc/lang/python38/patches/patch-Lib_lib2to3_pgen2_driver.py:1.2 --- pkgsrc/lang/python38/patches/patch-Lib_lib2to3_pgen2_driver.py:1.1 Fri Aug 14 19:28:44 2020 +++ pkgsrc/lang/python38/patches/patch-Lib_lib2to3_pgen2_driver.py Sat Aug 15 12:35:57 2020 @@ -1,4 +1,4 @@ -$NetBSD: patch-Lib_lib2to3_pgen2_driver.py,v 1.1 2020/08/14 19:28:44 schmonz Exp $ +$NetBSD: patch-Lib_lib2to3_pgen2_driver.py,v 1.2 2020/08/15 12:35:57 schmonz Exp $ On systems where both of the conditions @@ -14,6 +14,10 @@ staging the install. Then "make package" pkgsrc knows which version we're building. Pass that down instead. +In patch-Lib_distutils_unixccompiler.py, we override Python maintainers' +expectations for Linux builds in favor of pkgsrc's expectations for +builds on all platforms. This patch is needed because of that patch. + --- 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): --_----------=_159749495893830--