[Libreoffice-commits] core.git: external/python3

Robert Antoni Buj i Gelonch robert.buj at gmail.com
Mon Feb 2 14:10:43 PST 2015


 external/python3/ExternalProject_python3.mk |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 40432ac6caa478474d73786f95b808c14e106ff2
Author: Robert Antoni Buj i Gelonch <robert.buj at gmail.com>
Date:   Sun Nov 2 16:42:47 2014 +0100

    pyhon: add lib-dynload libs to fixinstallnames (OS X)
    
    Change-Id: Iab76060952ae8c1b64d3ff32e5ae8f5212e016b0
    Signed-off-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk
index 045892e..12a88c1 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -128,6 +128,10 @@ $(call gb_ExternalProject_get_state_target,python3,fixinstallnames) : $(call gb_
 		$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython \
 		@executable_path/../../../../LibreOfficePython \
 		$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/Resources/Python.app/Contents/MacOS/LibreOfficePython
+	for file in $(shell find $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload -name "*.so") ; do \
+	$(INSTALL_NAME_TOOL) -change \
+		$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython \
+		@loader_path/../../../LibreOfficePython $$file ; done
 	touch $@
 
 # also delete binaries that are symlinked in scp2


More information about the Libreoffice-commits mailing list