forked from amazingfate/loongoffice
b10be5d484
* 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>
22 lines
518 B
Plaintext
22 lines
518 B
Plaintext
--- Objects/obmalloc.c
|
|
+++ Objects/obmalloc.c
|
|
@@ -413,8 +413,8 @@
|
|
|
|
#ifdef WITH_PYMALLOC
|
|
|
|
+#define WITH_VALGRIND
|
|
#ifdef WITH_VALGRIND
|
|
-#include <valgrind/valgrind.h>
|
|
|
|
/* If we're using GCC, use __builtin_expect() to reduce overhead of
|
|
the valgrind checks */
|
|
@@ -1181,7 +1181,7 @@
|
|
|
|
#ifdef WITH_VALGRIND
|
|
if (UNLIKELY(running_on_valgrind == -1)) {
|
|
- running_on_valgrind = RUNNING_ON_VALGRIND;
|
|
+ running_on_valgrind = 1;
|
|
}
|
|
if (UNLIKELY(running_on_valgrind)) {
|
|
return NULL;
|