external/python3/ExternalPackage_python3.mk | 2 +-
external/python3/ExternalProject_python3.mk | 2 +-
external/python3/UnpackedTarball_python3.mk | 1 -
external/python3/python-3.5.tweak.strip.soabi.patch | 12 ------------
4 files changed, 2 insertions(+), 15 deletions(-)
New commits:
commit 3575986e30705d588d4eea94eb669474a3adbf77
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon Jan 27 12:56:08 2025 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Jan 27 15:46:25 2025 +0100
tdf#162786, tdf#159988: python3: do not strip soabi on linux/macOS
Otherwise libraries installed through pip do not work
Change-Id: Ib916964ce7d309faffaad1763884b1600b139c18
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180781
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/external/python3/ExternalPackage_python3.mk
b/external/python3/ExternalPackage_python3.mk
index c22c10ff4f7c..a6b0d352f84c 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -60,7 +60,7 @@ $(eval $(call
gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/libpython$(
# Obviously this list should not contain stuff with external dependencies
# that may not be available on baseline systems.
-python3_EXTENSION_MODULE_SUFFIX=cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(if
$(ENABLE_DBGUTIL),d)
+python3_EXTENSION_MODULE_SUFFIX=cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if
$(ENABLE_DBGUTIL),d)-x86_64-linux-gnu
python3_EXTENSION_MODULES= \
LO_lib/array.$(python3_EXTENSION_MODULE_SUFFIX).so \
LO_lib/_asyncio.$(python3_EXTENSION_MODULE_SUFFIX).so \
diff --git a/external/python3/ExternalProject_python3.mk
b/external/python3/ExternalProject_python3.mk
index 21c5f9a47a70..7530031563ee 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -143,7 +143,7 @@ endif
ifeq ($(OS),MACOSX)
python3_fw_prefix:=$(gb_UnpackedTarball_workdir)/python3/python-inst/@__________________________________________________OOO/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)
-python3_EXTENSION_MODULE_SUFFIX:=cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(if
$(ENABLE_DBGUTIL),d)
+python3_EXTENSION_MODULE_SUFFIX:=cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if
$(ENABLE_DBGUTIL),d)-darwin
# rule to allow relocating the whole framework, removing reference to
buildinstallation directory
# also scripts are not allowed to be signed as executables (with extended
attributes), but need to
diff --git a/external/python3/UnpackedTarball_python3.mk
b/external/python3/UnpackedTarball_python3.mk
index 8c648843f01e..28c22d0e3fca 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/python-3.7.6-msvc-ssl.patch.1 \
external/python3/python-3.5.4-msvc-disable.patch.1 \
external/python3/ubsan.patch.0 \
- external/python3/python-3.5.tweak.strip.soabi.patch \
external/python3/darwin.patch.0 \
external/python3/tsan.patch.0 \
external/python3/init-sys-streams-cant-initialize-stdin.patch.0 \
diff --git a/external/python3/python-3.5.tweak.strip.soabi.patch
b/external/python3/python-3.5.tweak.strip.soabi.patch
deleted file mode 100644
index 4c2bb2bb9a29..000000000000
--- a/external/python3/python-3.5.tweak.strip.soabi.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru python3.orig/configure python3/configure
---- misc/python3.orig/configure 2015-07-26 21:14:31.127377193 +0200
-+++ misc/python3/configure 2015-07-26 21:21:34.975405648 +0200
-@@ -15229,7 +15229,7 @@
- $as_echo "$ABIFLAGS" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5
- $as_echo_n "checking SOABI... " >&6; }
--SOABI='cpython-'`echo $VERSION | tr -d
.`${ABIFLAGS}${PLATFORM_TRIPLET:+-$PLATFORM_TRIPLET}
-+SOABI='cpython-'`echo $VERSION$ABIFLAGS`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SOABI" >&5
- $as_echo "$SOABI" >&6; }
-
