external/python3/python-3.3.3-disable-obmalloc.patch.0 | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 426b23ace0233d679d2167ea32597768e9684750
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Wed Jun 12 08:44:43 2024 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Jun 12 13:21:09 2024 +0200
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.bergm...@allotropia.de>
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Tested-by: Jenkins
(cherry picked from commit 9e6b4732ca2ad37a7bcfa6e406b3b244accd0508)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168712
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;
