summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-04-04 18:12:16 +0200
committerMatúš Kukan <matus.kukan@collabora.com>2014-04-08 10:20:24 +0200
commitc06d624c81bafba1b61052aa5078d10f023e276b (patch)
tree96215e28ad2e74a9c407f05c75d3cb666aa55a9c
parent902a3b030adf899699fc46d1a857734886eaceb4 (diff)
coinmp: actually link the libraries
Several people named Chris report failures in the solver unit test, and apparently the CoinMP libraries have loads of unresolved symbols because they don't have NEEDED entries, i.e. were not linked properly; let's see if this fixes it. Change-Id: Id406e14b0805a458d608c23cb7c65d873b5ba2f0 Reviewed-on: https://gerrit.libreoffice.org/8850 Reviewed-by: Chris Laplante <mostthingsweb@gmail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 6731f6c36faf64ab4522f0ffe2045c794849fabe)
-rw-r--r--external/coinmp/ExternalProject_coinmp.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk
index b66e8779dfec..c18f2d5f956f 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -27,6 +27,7 @@ else
$(call gb_ExternalProject_get_state_target,coinmp,build) :
+$(call gb_ExternalProject_run,build,\
./configure COIN_SKIP_PROJECTS="Data/Sample" \
+ --enable-dependency-linking \
&& $(MAKE) \
)