diff options
| author | Alexandru Ardelean <ardeleanalex@gmail.com> | 2021-10-27 12:10:02 +0300 |
|---|---|---|
| committer | Alexandru Ardelean <ardeleanalex@gmail.com> | 2021-11-19 13:30:14 +0200 |
| commit | 4e05541782edeb06b51d691dadf52648df24c940 (patch) | |
| tree | 4ddf18426d8772f09c6ec6e940be79ba2d669e6a /lang/python/python3/patches/016-adjust-config-paths.patch | |
| parent | b3237baf63b2b38c257ba9f6488d54fc89d5ed69 (diff) | |
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 <ardeleanalex@gmail.com>
Diffstat (limited to 'lang/python/python3/patches/016-adjust-config-paths.patch')
| -rw-r--r-- | lang/python/python3/patches/016-adjust-config-paths.patch | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/lang/python/python3/patches/016-adjust-config-paths.patch b/lang/python/python3/patches/016-adjust-config-paths.patch index 338892d88..c6583bea9 100644 --- a/lang/python/python3/patches/016-adjust-config-paths.patch +++ b/lang/python/python3/patches/016-adjust-config-paths.patch @@ -1,26 +1,16 @@ ---- a/Lib/distutils/sysconfig.py -+++ b/Lib/distutils/sysconfig.py -@@ -451,6 +451,7 @@ def _init_posix(): - platform=sys.platform, - multiarch=getattr(sys.implementation, '_multiarch', ''), - )) -+ name = '_sysconfigdata' - _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) - build_time_vars = _temp.build_time_vars - global _config_vars --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py -@@ -352,6 +352,7 @@ def get_makefile_filename(): +@@ -407,6 +407,7 @@ def get_makefile_filename(): def _get_sysconfigdata_name(): + return '_sysconfigdata' - return os.environ.get('_PYTHON_SYSCONFIGDATA_NAME', - '_sysconfigdata_{abi}_{platform}_{multiarch}'.format( - abi=sys.abiflags, + multiarch = getattr(sys.implementation, '_multiarch', '') + return os.environ.get( + '_PYTHON_SYSCONFIGDATA_NAME', --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -1555,7 +1555,7 @@ libinstall: build_all $(srcdir)/Modules/ +@@ -1594,7 +1594,7 @@ libinstall: build_all $(srcdir)/Modules/ esac; \ done; \ done @@ -28,8 +18,8 @@ + $(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata*.py \ $(DESTDIR)$(LIBDEST); \ $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt - ifeq (@COMPILE_ALL_TESTS@,yes) -@@ -1713,7 +1713,7 @@ sharedinstall: sharedmods + if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \ +@@ -1752,7 +1752,7 @@ sharedinstall: sharedmods --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ --root=$(DESTDIR)/ @@ -40,7 +30,7 @@ # Here are a couple of targets for MacOSX again, to install a full --- a/configure +++ b/configure -@@ -2979,7 +2979,7 @@ $as_echo_n "checking for python interpre +@@ -3009,7 +3009,7 @@ $as_echo_n "checking for python interpre fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $interp" >&5 $as_echo "$interp" >&6; } @@ -49,7 +39,7 @@ fi elif test "$cross_compiling" = maybe; then as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5 -@@ -15460,7 +15460,7 @@ fi +@@ -15477,7 +15477,7 @@ fi @@ -69,7 +59,7 @@ fi elif test "$cross_compiling" = maybe; then AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) -@@ -4858,7 +4858,7 @@ fi], +@@ -4856,7 +4856,7 @@ fi], dnl define LIBPL after ABIFLAGS and LDVERSION is defined. AC_SUBST(PY_ENABLE_SHARED) |
