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

[Andrzej Hunt]

Rebased ref, commits from common ancestor:
commit e0d7de574cadaed45f6988281e14c1385adaa03f
Author: Andrzej Hunt <andrzej at ahunt.org>
Date:   Wed Jun 3 17:55:59 2015 +0100

    Possibly fix udunits2 loading on OSX
    
    Change-Id: I048d23d647a6d6f38efddc11f7d3bde3b583e752

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2f633bd..2e3b1ec 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -177,7 +177,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-	-L$(call gb_UnpackedTarball_get_dir,udunits2)/lib -ludunits2 \
+	-L$(call gb_UnpackedTarball_get_dir,udunits2)/lib/.libs -ludunits2 \
 )
 endif
 
diff --git a/external/udunits2/ExternalProject_udunits2.mk b/external/udunits2/ExternalProject_udunits2.mk
index ba6479e..ad0da50 100644
--- a/external/udunits2/ExternalProject_udunits2.mk
+++ b/external/udunits2/ExternalProject_udunits2.mk
@@ -24,6 +24,9 @@ $(call gb_ExternalProject_get_state_target,udunits2,build) : $(call gb_ExternalP
 	    $(MAKE) libudunits2.la && \
 		mkdir udunits2 && \
 		cp udunits2.h udunits2/ \
+		$(if $(filter MACOSX,$(OS)),&& $(PERL) \
+			$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+			$(gb_Package_SOURCEDIR_udunits2)/lib/.libs/libudunits2.0.dylib) \
 	)
 
 $(call gb_ExternalProject_get_state_target,udunits2,configure) :
diff --git a/external/udunits2/UnpackedTarball_udunits2.mk b/external/udunits2/UnpackedTarball_udunits2.mk
index db096ca..820472e 100644
--- a/external/udunits2/UnpackedTarball_udunits2.mk
+++ b/external/udunits2/UnpackedTarball_udunits2.mk
@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,udunits2))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,udunits2,$(UDUNITS2_TARBALL)))
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_UnpackedTarball_add_patches,udunits2,\
+	external/udunits2/udunits2-macosx.patch.1 \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/udunits2/udunits2-macosx.patch.1 b/external/udunits2/udunits2-macosx.patch.1
new file mode 100644
index 0000000..8f5f207
--- /dev/null
+++ b/external/udunits2/udunits2-macosx.patch.1
@@ -0,0 +1,11 @@
+diff -ur udunits2.org/lib/Makefile.in udunits2/lib/Makefile.in
+--- udunits2.org/lib/Makefile.in	2015-06-03 17:51:56.955223787 +0100
++++ udunits2/lib/Makefile.in	2015-06-03 17:52:56.659947119 +0100
+@@ -94,6 +94,7 @@
+ libudunits2_la_OBJECTS = $(am_libudunits2_la_OBJECTS)
+ libudunits2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	-install_name @__________________________________________________OOO/libudunits2.0.dylib \
+ 	$(libudunits2_la_LDFLAGS) $(LDFLAGS) -o $@
+ @ENABLE_UDUNITS_1_TRUE@@HAVE_CUNIT_TRUE at am__EXEEXT_1 =  \
+ @ENABLE_UDUNITS_1_TRUE@@HAVE_CUNIT_TRUE@	testUnits-1$(EXEEXT)