From 4e05541782edeb06b51d691dadf52648df24c940 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Wed, 27 Oct 2021 12:10:02 +0300 Subject: python3: bump to version 3.10.0 Manually re-applied: 008-distutils-use-python-sysroot.patch 016-adjust-config-paths.patch Drop patch: 003-do-not-run-distutils-tests.patch There is now a configure option '--disable-test-modules' And seems we left the '_ctypes_test' around for quite some time. Dropped now. Refs: https://bugs.python.org/issue27640 https://bugs.python.org/issue43282 Drop patch: 013-getbuildinfo-date-time-source-date-epoch.patch Python build honors SOURCE_DATE_EPOCH pretty well now. Drop setuptools patches. Setuptools should be reproducible with Python 3.6+ according to a mention here: https://github.com/pypa/setuptools/pull/1690#issuecomment-536517456 It's time to let upstream fix Setuptools reproduce-ability. Drop patch: 010-do-not-add-rt-lib-dirs-when-cross-compiling.patch I can't seem to fully remember why it's there. And it seem to build fine without it. Drop patch: 015-abort-on-failed-modules.patch Python build supports a similar PYTHONSTRICTEXTENSIONBUILD=1 env-var option. Add patch: 026-openssl-feature-flags.patch We need to keep this in our tree for a while. See: https://bugs.python.org/issue45627 Backport patch: 027-bpo-43158-Use-configure-values-for-building-_uuid-ex.patch Link: https://github.com/python/cpython/pull/29353 Fixes the build for uuid C module. Add patch: 028-host-python-support-ssl-with-libressl.patch We need the _ssl module working on the host-side with LibreSSL for pip to work to download from https://pypi.org Refs: https://github.com/openwrt/openwrt/pull/4749 Add patch: 029-disable-deprecation-warning.patch Fixes apparmor build. The warning causes a configure error. Refreshed the rest of patches. Some old build-flags were removed. They don't seem to be necessary anymore. Split python3-uuid from python3-light. To better manage the libuuid library (if needed). Also, fixing the uuid C module build. Seems this was failing, and was falling back to using hashlib. Signed-off-by: Alexandru Ardelean --- lang/python/python3/patches-setuptools/.placeholder | 0 .../python3/patches-setuptools/001-reproducible.patch | 16 ---------------- .../python3/patches-setuptools/002-sorted-requires.patch | 16 ---------------- .../003-PKG-INFO-output-reproducible.patch | 14 -------------- 4 files changed, 46 deletions(-) create mode 100644 lang/python/python3/patches-setuptools/.placeholder delete mode 100644 lang/python/python3/patches-setuptools/001-reproducible.patch delete mode 100644 lang/python/python3/patches-setuptools/002-sorted-requires.patch delete mode 100644 lang/python/python3/patches-setuptools/003-PKG-INFO-output-reproducible.patch (limited to 'lang/python/python3/patches-setuptools') diff --git a/lang/python/python3/patches-setuptools/.placeholder b/lang/python/python3/patches-setuptools/.placeholder new file mode 100644 index 000000000..e69de29bb diff --git a/lang/python/python3/patches-setuptools/001-reproducible.patch b/lang/python/python3/patches-setuptools/001-reproducible.patch deleted file mode 100644 index a4e80103f..000000000 --- a/lang/python/python3/patches-setuptools/001-reproducible.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=848136 -https://sources.debian.org/patches/python-setuptools/40.8.0-1/reproducible.diff/ - -Index: b/setuptools/command/easy_install.py -=================================================================== ---- a/setuptools/command/easy_install.py -+++ b/setuptools/command/easy_install.py -@@ -423,7 +423,7 @@ class easy_install(Command): - for spec in self.args: - self.easy_install(spec, not self.no_deps) - if self.record: -- outputs = self.outputs -+ outputs = list(sorted(self.outputs)) - if self.root: # strip any package prefix - root_len = len(self.root) - for counter in range(len(outputs)): diff --git a/lang/python/python3/patches-setuptools/002-sorted-requires.patch b/lang/python/python3/patches-setuptools/002-sorted-requires.patch deleted file mode 100644 index 9e48f523e..000000000 --- a/lang/python/python3/patches-setuptools/002-sorted-requires.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804249 -https://sources.debian.org/patches/python-setuptools/40.8.0-1/sorted-requires.diff/ - -Index: b/setuptools/command/egg_info.py -=================================================================== ---- a/setuptools/command/egg_info.py -+++ b/setuptools/command/egg_info.py -@@ -641,7 +641,7 @@ def _write_requirements(stream, reqs): - - def append_cr(line): - return line + '\n' -- lines = map(append_cr, lines) -+ lines = map(append_cr, sorted(lines)) - stream.writelines(lines) - - diff --git a/lang/python/python3/patches-setuptools/003-PKG-INFO-output-reproducible.patch b/lang/python/python3/patches-setuptools/003-PKG-INFO-output-reproducible.patch deleted file mode 100644 index f1b6ca169..000000000 --- a/lang/python/python3/patches-setuptools/003-PKG-INFO-output-reproducible.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=894215 -https://sources.debian.org/patches/python-setuptools/40.8.0-1/PKG-INFO-output-reproducible.diff/ - ---- a/setuptools/dist.py -+++ b/setuptools/dist.py -@@ -193,7 +193,7 @@ def write_pkg_file(self, file): - self.long_description_content_type - ) - if self.provides_extras: -- for extra in self.provides_extras: -+ for extra in sorted(self.provides_extras): - write_field('Provides-Extra', extra) - - -- cgit