[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - external/libetonyek

David Tardon dtardon at redhat.com
Wed Jul 1 04:55:25 PDT 2015


 external/libetonyek/ExternalProject_libetonyek.mk |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 045e3aa799851f905f7ba180207f88cca93607fb
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Jun 28 12:33:46 2015 +0200

    tdf#92376 fix build of libetonyek on OS X
    
    (cherry picked from commit a94acabae7defe562e3702f605c63afbd86f9696)
    
    Change-Id: Ia4941184efb0cf6e84548f278e61e955a0b5b1f5
    Reviewed-on: https://gerrit.libreoffice.org/16558
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk
index 119ac83..fbb754e 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -47,6 +47,10 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 		&& $(MAKE) \
+		$(if $(filter MACOSX,$(OS)),\
+			&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+				$(EXTERNAL_WORKDIR)/src/lib/.libs/libetonyek-0.1.1.dylib \
+		) \
 	)
 
 # vim: set noet sw=4 ts=4:


More information about the Libreoffice-commits mailing list