summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorStephan Bergmann <stephan.bergmann@allotropia.de>2024-06-12 08:44:43 +0200
committerStephan Bergmann <stephan.bergmann@allotropia.de>2024-06-12 12:05:06 +0200
commit9e6b4732ca2ad37a7bcfa6e406b3b244accd0508 (patch)
treec634bc3a2e5c3614e66ca40db2d4a27b4db8133b /external
parentc49da95942f456623e91ae1f5c1a68efd83fec6c (diff)
Fix --disable-runtime-optimizations build
...after 19e9e49bdaeebc314c892c000385ec778edf759b "python3: upgrade to 3.9.19", by making external/python3/python-3.3.3-disable-obmalloc.patch.0 apply again Change-Id: I295e470f3e86740ee276336dd04c227b2b316140 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168695 Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins
Diffstat (limited to 'external')
-rw-r--r--external/python3/python-3.3.3-disable-obmalloc.patch.010
1 files changed, 5 insertions, 5 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 c4a1dea61ecf..9549e52af3fb 100644
--- a/external/python3/python-3.3.3-disable-obmalloc.patch.0
+++ b/external/python3/python-3.3.3-disable-obmalloc.patch.0
@@ -1,6 +1,6 @@
--- Objects/obmalloc.c
+++ Objects/obmalloc.c
-@@ -712,8 +712,8 @@
+@@ -722,8 +722,8 @@
#ifdef WITH_PYMALLOC
@@ -8,10 +8,10 @@
#ifdef WITH_VALGRIND
-#include <valgrind/valgrind.h>
- /* If we're using GCC, use __builtin_expect() to reduce overhead of
- the valgrind checks */
-@@ -1430,7 +1430,7 @@
-
+ /* -1 indicates that we haven't checked that we're running on valgrind yet. */
+ static int running_on_valgrind = -1;
+@@ -1591,7 +1591,7 @@
+ {
#ifdef WITH_VALGRIND
if (UNLIKELY(running_on_valgrind == -1)) {
- running_on_valgrind = RUNNING_ON_VALGRIND;