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

[Stephan Bergmann]

 external/liborcus/ExternalProject_liborcus.mk |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 2b121ad11a4e465bff94816513f6e390061aa811
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jun 9 21:27:54 2015 +0200

    Fix Mac OS X install names of external liborcus
    
    Change-Id: I0304b13b441654636f633a97012ac91863d0b4d9

diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
index c9adc47..5c7736e 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -96,10 +96,16 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
 			--disable-spreadsheet-model \
 			--without-tools \
 			--disable-werror \
+			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 			$(if $(SYSTEM_BOOST),,--with-boost=$(WORKDIR)/UnpackedTarball/boost) \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& $(if $(VERBOSE)$(verbose),V=1) \
 		   $(MAKE) \
+		$(if $(filter MACOSX,$(OS)),\
+			&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+				$(gb_Package_SOURCEDIR_liborcus)/src/liborcus/.libs/liborcus-0.10.0.dylib \
+				$(gb_Package_SOURCEDIR_liborcus)/src/parser/.libs/liborcus-parser-0.10.0.dylib \
+		) \
 	)
 
 # vim: set noet sw=4 ts=4: