summaryrefslogtreecommitdiff
path: root/external/python3/python-3.3.3-disable-obmalloc.patch.0
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2019-12-09 14:08:19 +0100
committerMichael Stahl <michael.stahl@cib.de>2020-01-08 10:22:17 +0100
commitb10be5d48433076f0b7238d818020f708553e114 (patch)
treea36cda1b584db93f10776d222356656e2f94b80e /external/python3/python-3.3.3-disable-obmalloc.patch.0
parent468a740f0fe09f8939368eca3067b4101c84c057 (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/python-3.3.3-disable-obmalloc.patch.0')
-rw-r--r--external/python3/python-3.3.3-disable-obmalloc.patch.019
1 files changed, 4 insertions, 15 deletions
diff --git a/external/python3/python-3.3.3-disable-obmalloc.patch.0 b/external/python3/python-3.3.3-disable-obmalloc.patch.0
index a162298d4971..0963a5f1bb1d 100644
--- a/external/python3/python-3.3.3-disable-obmalloc.patch.0
+++ b/external/python3/python-3.3.3-disable-obmalloc.patch.0
@@ -1,14 +1,3 @@
---- Include/objimpl.h
-+++ Include/objimpl.h
-@@ -250,7 +250,7 @@
- union _gc_head *gc_prev;
- Py_ssize_t gc_refs;
- } gc;
-- double dummy; /* force worst-case alignment */
-+ long double dummy; /* force worst-case alignment */
- } PyGC_Head;
-
- extern PyGC_Head *_PyGC_generation0;
--- Objects/obmalloc.c
+++ Objects/obmalloc.c
@@ -413,8 +413,8 @@
@@ -24,9 +13,9 @@
@@ -1181,7 +1181,7 @@
#ifdef WITH_VALGRIND
- if (UNLIKELY(running_on_valgrind == -1))
+ if (UNLIKELY(running_on_valgrind == -1)) {
- running_on_valgrind = RUNNING_ON_VALGRIND;
+ running_on_valgrind = 1;
- if (UNLIKELY(running_on_valgrind))
- goto redirect;
- #endif
+ }
+ if (UNLIKELY(running_on_valgrind)) {
+ return NULL;