[Libreoffice-commits] core.git: Branch 'feature/unitver' - external/udunits2

Andrzej Hunt andrzej at ahunt.org
Wed Jun 3 08:08:18 PDT 2015


 external/udunits2/ExternalProject_udunits2.mk |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a07e4dfa9ddf3fbc4400418102db6c4c399b781a
Author: Andrzej Hunt <andrzej at ahunt.org>
Date:   Wed Jun 3 16:07:53 2015 +0100

    Possibly fix udunits2 loading on OSX
    
    Change-Id: I048d23d647a6d6f38efddc11f7d3bde3b583e752

diff --git a/external/udunits2/ExternalProject_udunits2.mk b/external/udunits2/ExternalProject_udunits2.mk
index ba6479e..f5a05c0 100644
--- a/external/udunits2/ExternalProject_udunits2.mk
+++ b/external/udunits2/ExternalProject_udunits2.mk
@@ -21,7 +21,10 @@ $(eval $(call gb_ExternalProject_register_targets,udunits2,\
 $(call gb_ExternalProject_get_state_target,udunits2,build) : $(call gb_ExternalProject_get_state_target,udunits2,configure)
 	+$(call gb_ExternalProject_run,build,\
 		cd lib && \
-	    $(MAKE) libudunits2.la && \
+	    $(MAKE) libudunits2.la \
+		$(if $(filter MACOSX,$(OS)),&& $(PERL) \
+			$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+			$(gb_Package_SOURCEDIR_udunits2)/lib/.lib/libudunits2.0.dylib) && \
 		mkdir udunits2 && \
 		cp udunits2.h udunits2/ \
 	)


More information about the Libreoffice-commits mailing list