From 853cc90f49d59a94242494c4aee2479de0865486 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 9 Dec 2019 14:08:19 +0100 Subject: 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 (cherry picked from commit b10be5d48433076f0b7238d818020f708553e114) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86398 Reviewed-by: Christian Lohmaier --- bin/check-elf-dynamic-objects | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'bin') diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects index 45bd0ecf45c6..d1b7ab5522f4 100755 --- a/bin/check-elf-dynamic-objects +++ b/bin/check-elf-dynamic-objects @@ -111,6 +111,12 @@ local file="$1" # skip the majority of files, no ELF binaries here skip=1 ;; + */_ctypes.cpython-*.so) + whitelist="${whitelist} libffi.so.6" # TODO dubious? + ;; + */_uuid.cpython-*.so) + whitelist="${whitelist} libuuid.so.1" + ;; */libcairo.so.2) whitelist="${whitelist} ${x11whitelist} libxcb-shm.so.0 libxcb.so.1 libxcb-render.so.0" ;; -- cgit