external/python3/ExternalPackage_python3.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c4a57f59d56312bbdcb507ecbf13b75c6c6db1dc
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Wed Nov 8 11:55:51 2023 +0100
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sat Nov 11 18:09:49 2023 +0100
python3: name gdb pretty-printer after .so, not .bin
So it works not only with instdir/program/python but also with
soffice in-process python.
Change-Id: I5c3643ef4a7ca0f25df3c6f51d11ff98c27f4bd8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159148
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
(cherry picked from commit a2fabc78a4ba12ad8df6b040783be0fa22aefa54)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159049
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/external/python3/ExternalPackage_python3.mk
b/external/python3/ExternalPackage_python3.mk
index 1f29c9efbebb..37dfa4668283 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -48,7 +48,7 @@ else
$(eval $(call
gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python.bin,python))
$(eval $(call
gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(if
$(ENABLE_DBGUTIL),d).so,libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(if
$(ENABLE_DBGUTIL),d).so))
$(eval $(call
gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(if
$(ENABLE_DBGUTIL),d).so.1.0,libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(if
$(ENABLE_DBGUTIL),d).so))
-$(eval $(call
gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python.bin-gdb.py,Tools/gdb/libpython.py))
+$(eval $(call
gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(if
$(ENABLE_DBGUTIL),d).so.1.0-gdb.py,Tools/gdb/libpython.py))
# Unfortunately the python build system does not allow to explicitly enable or
# disable these, it just tries to build them and then prints which did not
