diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-12-09 14:08:19 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-01-08 10:22:17 +0100 |
| commit | b10be5d48433076f0b7238d818020f708553e114 (patch) | |
| tree | a36cda1b584db93f10776d222356656e2f94b80e /external/python3/UnpackedTarball_python3.mk | |
| parent | 468a740f0fe09f8939368eca3067b4101c84c057 (diff) | |
python3: upgrade to release 3.7.6
* external/python3/python-3.3.3-aix.patch.1:
most of it doesn't apply and AIX port isn't maintained anyway so
remove it for now
* external/python3/ubsan.patch.0:
apparently one of the files was removed
* 0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1:
fixed upstream
* python3-osx-avoid-new-10.13.patch.1:
replace with simply passing ac_cv_func_utimensat=no to configure
* external/python3/python-3.5.4-ssl.patch.1:
project files to build OpenSSL removed upstream
* There have been changes to how python locates OpenSSL; new variables
OPENSSL_INCLUDES etc; it turns out that you have to pass one directory
to --with-openssl, as the variables cannot be passed
* libuuid.so.1 is a new dependency of the _uuid module
* libffi.so.6 is a new dependency of the _ctypes module (the bundled
copy of libffi for non-Darwin platforms was removed)
* python-3.3.0-pythreadstate.patch.1:
the PyThreadState functions have been changed such that
CppunitTest_services asserts when there is a PyThreadAttach on top of
PyThreadDetach on top of PyThreadAttach, i.e., 2 PyThreadState per
thread (PyGILState_Check() fails). Instead of patching in additional
workarounds, change PyThreadAttach so that it re-uses an existing
PyThreadState if one exists for the thread.
Change-Id: I24c19d79b43a30709261fd9db66312b2e3872fd9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84765
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'external/python3/UnpackedTarball_python3.mk')
| -rw-r--r-- | external/python3/UnpackedTarball_python3.mk | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk index 29d417e57833..d04868b93a44 100644 --- a/external/python3/UnpackedTarball_python3.mk +++ b/external/python3/UnpackedTarball_python3.mk @@ -17,16 +17,13 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ external/python3/i100492-freebsd.patch.1 \ - $(if $(filter AIX,$(OS)),external/python3/python-3.3.3-aix.patch.1) \ external/python3/python-3.3.0-darwin.patch.1 \ - external/python3/python-3.5.4-ssl.patch.1 \ + external/python3/python-3.7.6-msvc-ssl.patch.1 \ external/python3/python-3.5.4-msvc-disable.patch.1 \ - external/python3/python-3.3.0-pythreadstate.patch.1 \ external/python3/python-3.3.0-clang.patch.1 \ external/python3/ubsan.patch.0 \ external/python3/python-3.5.tweak.strip.soabi.patch \ external/python3/darwin.patch.0 \ - external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1 \ )) ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),) @@ -47,12 +44,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3, \ )) endif -ifeq ($(OS),MACOSX) -ifneq ($(filter 1090 101000 101100 101200,$(MAC_OS_X_VERSION_MIN_REQUIRED)),) -$(eval $(call gb_UnpackedTarball_add_patches,python3,\ - external/python3/python3-osx-avoid-new-10.13.patch.1 \ -)) -endif -endif - # vim: set noet sw=4 ts=4: |