Rebased ref, commits from common ancestor:
commit 869f0130f3fbab066ff03763099e59d83727f7ab
Author: Andrzej Hunt <[email protected]>
Date: Wed Jun 3 17:26:38 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 2ff0187..ad0da50 100644
--- a/external/udunits2/ExternalProject_udunits2.mk
+++ b/external/udunits2/ExternalProject_udunits2.mk
@@ -26,7 +26,7 @@ $(call gb_ExternalProject_get_state_target,udunits2,build) :
$(call gb_ExternalP
cp udunits2.h udunits2/ \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl
OOO \
-
$(gb_Package_SOURCEDIR_udunits2)/.libs/libudunits2.0.dylib) \
+
$(gb_Package_SOURCEDIR_udunits2)/lib/.libs/libudunits2.0.dylib) \
)
$(call gb_ExternalProject_get_state_target,udunits2,configure) :
commit 860576e8a77dbd946d8853f9e5f1e003299bd58e
Author: Andrzej Hunt <[email protected]>
Date: Wed Jun 3 17:14:57 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..2ff0187 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)/.libs/libudunits2.0.dylib) \
)
$(call gb_ExternalProject_get_state_target,udunits2,configure) :
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
