summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-01-29 10:02:25 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-02-02 15:44:42 +0000
commitfd2fb1b5478d6c636434cfa4e1af347244561d49 (patch)
treec6344408f773ea3178c135d3871dbc3d9272331b
parentd1c6c9d3390a6861ee71156e27383a85eea29510 (diff)
tdf#80370: Fix Mac OS X install names of external/{coinmp,lpsolve}
Change-Id: I240c8c940d7d3e1310c4ee33911e8c7019e67060 (cherry picked from commit f694ab5198587dcacd8c40c9095e7bc9435cbff2) Reviewed-on: https://gerrit.libreoffice.org/14274 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--external/coinmp/ExternalProject_coinmp.mk11
-rw-r--r--external/lpsolve/ExternalProject_lpsolve.mk1
2 files changed, 12 insertions, 0 deletions
diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk
index c140d0e92f11..6a2ccf8b99c6 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 a40ada47c8b4..62c4a1bea252 100644
--- a/external/lpsolve/ExternalProject_lpsolve.mk
+++ b/external/lpsolve/ExternalProject_lpsolve.mk
@@ -33,6 +33,7 @@ else # $(OS)!=WNT
$(call gb_ExternalProject_get_state_target,lpsolve,build):
$(call gb_ExternalProject_run,build,\
CC="$(CC) $(if $(debug),$(gb_COMPILERNOOPTFLAGS) $(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS))" \
+ $(if $(filter MACOSX,$(OS)),EXTRA_LINKFLAGS='-install_name @__________________________________________________OOO/liblpsolve55.dylib') \
sh -e $(if $(filter MACOSX,$(OS)),ccc.osx, \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),ccc.static, \
$(if $(filter AIXGCC,$(OS)$(COM)),ccc.aix.gcc, \