[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-4-1-6+backports' - python3/ExternalPackage_python3.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Aug 17 23:19:29 UTC 2018


 python3/ExternalPackage_python3.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9aaadf9467bbcfac256b92ec71e7af703ec9116b
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Sat Aug 18 01:18:38 2018 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Sat Aug 18 01:18:38 2018 +0200

    python3: deliver versioned libpython3.3m.so.1.0
    
    Change-Id: I41846893443e48f3859c78f09cdae4b5a6d0975a

diff --git a/python3/ExternalPackage_python3.mk b/python3/ExternalPackage_python3.mk
index 3cd212663347..3a36d4e33fde 100644
--- a/python3/ExternalPackage_python3.mk
+++ b/python3/ExternalPackage_python3.mk
@@ -46,8 +46,9 @@ else
 $(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/python.bin,python))
 $(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/libpython$(PYTHON_VERSION_MAJOR).so,libpython$(PYTHON_VERSION_MAJOR).so))
 $(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so,libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so))
+# versioned lib/libpython3.3m.so.1.0 appears to be necessary?
+$(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so.1.0,libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so.1.0))
 $(eval $(call gb_ExternalPackage_add_file,python3,$(gb_Package_PROGRAMDIRNAME)/libpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so-gdb.py,Tools/gdb/libpython.py))
-# versioned lib/libpython3.3m.so.1.0 appears to be unnecessary?
 
 # 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


More information about the Libreoffice-commits mailing list