external/coinmp/ExternalProject_coinmp.mk | 11 +++++++++++
external/lpsolve/ExternalProject_lpsolve.mk | 1 +
2 files changed, 12 insertions(+)
New commits:
commit f8508b19f3c1aafe970d8e9cc49af355de3b417e
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Jan 29 10:02:25 2015 +0100
tdf#80370: Fix Mac OS X install names of external/{coinmp,lpsolve}
(cherry picked from commit f694ab5198587dcacd8c40c9095e7bc9435cbff2)
Conflicts:
external/lpsolve/ExternalProject_lpsolve.mk
Change-Id: I240c8c940d7d3e1310c4ee33911e8c7019e67060
Reviewed-on: https://gerrit.libreoffice.org/14288
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/external/coinmp/ExternalProject_coinmp.mk
b/external/coinmp/ExternalProject_coinmp.mk
index b483d45..19286b1 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -29,8 +29,19 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
./configure COIN_SKIP_PROJECTS="Data/Sample" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
$(if $(DISABLE_DYNLOADING),--disable-shared) \
+ $(if $(filter
MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)
\
--enable-dependency-linking F77=unavailable \
&& $(MAKE) \
+ $(if $(filter MACOSX,$(OS)),&& $(PERL) \
+ $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl
OOO \
+
$(gb_Package_SOURCEDIR_coinmp)/Cbc/src/.libs/libCbc.3.8.8.dylib \
+
$(gb_Package_SOURCEDIR_coinmp)/Cbc/src/.libs/libCbcSolver.3.8.8.dylib \
+
$(gb_Package_SOURCEDIR_coinmp)/Cgl/src/.libs/libCgl.1.8.5.dylib \
+
$(gb_Package_SOURCEDIR_coinmp)/Clp/src/.libs/libClp.1.12.6.dylib \
+
$(gb_Package_SOURCEDIR_coinmp)/Clp/src/OsiClp/.libs/libOsiClp.1.12.6.dylib \
+
$(gb_Package_SOURCEDIR_coinmp)/CoinMP/src/.libs/libCoinMP.1.7.6.dylib \
+
$(gb_Package_SOURCEDIR_coinmp)/CoinUtils/src/.libs/libCoinUtils.3.9.11.dylib \
+
$(gb_Package_SOURCEDIR_coinmp)/Osi/src/Osi/.libs/libOsi.1.11.5.dylib) \
)
endif
diff --git a/external/lpsolve/ExternalProject_lpsolve.mk
b/external/lpsolve/ExternalProject_lpsolve.mk
index 9576298..dc1b482 100644
--- a/external/lpsolve/ExternalProject_lpsolve.mk
+++ b/external/lpsolve/ExternalProject_lpsolve.mk
@@ -32,6 +32,7 @@ endif # $(COM)
else # $(OS)!=WNT
$(call gb_ExternalProject_get_state_target,lpsolve,build):
$(call gb_ExternalProject_run,build,\
+ $(if $(filter MACOSX,$(OS)),EXTRA_LINKFLAGS='-install_name
@__________________________________________________OOO/liblpsolve55.dylib') \
sh $(if $(filter MACOSX,$(OS)),ccc.osx, \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),ccc.static, \
$(if $(filter AIXGCC,$(OS)$(COM)),ccc.aix.gcc, \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
