[Libreoffice-commits] core.git: 4 commits - bin/lo-all-static-libs configure.ac external/coinmp

[Tor Lillqvist]

 bin/lo-all-static-libs                    |    7 +++++
 configure.ac                              |   42 +++++++++++++++---------------
 external/coinmp/ExternalPackage_coinmp.mk |    2 +
 external/coinmp/ExternalProject_coinmp.mk |    2 +
 4 files changed, 33 insertions(+), 20 deletions(-)

New commits:
commit c1fd24e18fe82e761cfa2a07dc8acf13365dfd81
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue May 20 14:32:17 2014 +0300

    Add the CoinMP libs
    
    Change-Id: I37b4c1081055f98c9254d64480efeb2c205e711d

diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 5a71eae..77c0507 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -52,6 +52,13 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
      $foolibs \
      $WORKDIR/LinkTarget/StaticLibrary/lib*.a \
      $oslibs \
+     $WORKDIR/UnpackedTarball/coinmp/Cbc/src/.libs/*.a \
+     $WORKDIR/UnpackedTarball/coinmp/Cgl/src/.libs/*.a \
+     $WORKDIR/UnpackedTarball/coinmp/Clp/src/.libs/*.a \
+     $WORKDIR/UnpackedTarball/coinmp/Clp/src/OsiClp/.libs/*.a \
+     $WORKDIR/UnpackedTarball/coinmp/CoinMP/src/.libs/*.a \
+     $WORKDIR/UnpackedTarball/coinmp/CoinUtils/src/.libs/*.a \
+     $WORKDIR/UnpackedTarball/coinmp/Osi/src/Osi/.libs/*.a \
      $WORKDIR/UnpackedTarball/glew/lib/*.a \
      $WORKDIR/UnpackedTarball/icu/source/lib/*.a \
      $WORKDIR/UnpackedTarball/lcms2/src/.libs/*.a \
commit dd633de592fde183c06101cb082744c9ce270796
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue May 20 14:31:57 2014 +0300

    Make CoinMP build for iOS
    
    Change-Id: I8adff18896115d7dd0fce49916a18dc830506a36

diff --git a/external/coinmp/ExternalPackage_coinmp.mk b/external/coinmp/ExternalPackage_coinmp.mk
index bbea3dd..b0d29c2 100644
--- a/external/coinmp/ExternalPackage_coinmp.mk
+++ b/external/coinmp/ExternalPackage_coinmp.mk
@@ -13,6 +13,8 @@ $(eval $(call gb_ExternalPackage_use_external_project,coinmp,coinmp))
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,CoinMP/MSVisualStudio/v9/$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.dll))
+else ifneq ($(DISABLE_DYNLOADING),)
+# Just use the static archives from workdir. See bin/lo-all-static-libs
 else ifeq ($(OS),MACOSX)
 $(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbc.3.dylib,Cbc/src/.libs/libCbc.3.dylib))
 $(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbcSolver.3.dylib,Cbc/src/.libs/libCbcSolver.3.dylib))
diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk
index 22769e3..71e1982 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -27,6 +27,8 @@ else
 $(call gb_ExternalProject_get_state_target,coinmp,build) :
 	+$(call gb_ExternalProject_run,build,\
 		./configure COIN_SKIP_PROJECTS="Data/Sample" \
+			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(DISABLE_DYNLOADING),--disable-shared) \
 			--enable-dependency-linking F77=unavailable \
 		&& $(MAKE) \
 	)
commit 4474d705ae2366c056630646677c85f95e2a7c97
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue May 20 13:18:15 2014 +0300

    No reason to avoid CoinMP for Android and iOS
    
    Change-Id: I78eb3a706251ba64ad87e7985fc43c90bea2f767

diff --git a/configure.ac b/configure.ac
index 91f464d..96259be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -677,7 +677,7 @@ linux-android*)
     enable_lotuswordpro=no
     enable_mpl_subset=yes
     enable_opengl=no
-    enable_coinmp=no
+    enable_coinmp=yes
     enable_lpsolve=no
     enable_report_builder=no
     with_theme="tango"
@@ -7433,7 +7433,7 @@ if test $_os = iOS; then
     enable_mpl_subset=yes
     enable_opengl=no
     enable_lotuswordpro=no
-    enable_coinmp=no
+    enable_coinmp=yes
     enable_lpsolve=no
     enable_postgresql_sdbc=no
     enable_extension_integration=no
commit 8517dc95a6ad6eec34aa5295b5133c6c18fcd1e9
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue May 20 13:03:06 2014 +0300

    If we don't want lpsolve we don't want lpsolve
    
    Change-Id: I6038faf296831da0855eb7cd3628c5c6978d4cb3

diff --git a/configure.ac b/configure.ac
index b4052c6..91f464d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9560,24 +9560,26 @@ else
 fi
 AC_SUBST(ENABLE_LPSOLVE)
 
-AC_MSG_CHECKING([which lpsolve to use])
-if test "$with_system_lpsolve" = "yes"; then
-    AC_MSG_RESULT([external])
-    SYSTEM_LPSOLVE=TRUE
-    AC_CHECK_HEADER(lpsolve/lp_lib.h, [],
-       [ AC_MSG_ERROR(lpsolve headers not found.)], [])
-    save_LIBS=$LIBS
-    # some systems need this. Like Ubuntu....
-    AC_CHECK_LIB(m, floor)
-    AC_CHECK_LIB(dl, dlopen)
-    AC_CHECK_LIB([lpsolve55], [make_lp], [:],
-        [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
-    LIBS=$save_LIBS
-    libo_MINGW_CHECK_DLL([lpsolve55])
-else
-    AC_MSG_RESULT([internal])
-    SYSTEM_LPSOLVE=
-    BUILD_TYPE="$BUILD_TYPE LPSOLVE"
+if test "$ENABLE_LPSOLVE" = TRUE; then
+    AC_MSG_CHECKING([which lpsolve to use])
+    if test "$with_system_lpsolve" = "yes"; then
+        AC_MSG_RESULT([external])
+        SYSTEM_LPSOLVE=TRUE
+        AC_CHECK_HEADER(lpsolve/lp_lib.h, [],
+           [ AC_MSG_ERROR(lpsolve headers not found.)], [])
+        save_LIBS=$LIBS
+        # some systems need this. Like Ubuntu....
+        AC_CHECK_LIB(m, floor)
+        AC_CHECK_LIB(dl, dlopen)
+        AC_CHECK_LIB([lpsolve55], [make_lp], [:],
+            [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
+        LIBS=$save_LIBS
+        libo_MINGW_CHECK_DLL([lpsolve55])
+    else
+        AC_MSG_RESULT([internal])
+        SYSTEM_LPSOLVE=
+        BUILD_TYPE="$BUILD_TYPE LPSOLVE"
+    fi
 fi
 AC_SUBST(SYSTEM_LPSOLVE)