[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 4 commits - coinmp/ExternalPackage_coinmp.mk coinmp/ExternalProject_coinmp.mk configure.ac RepositoryExternal.mk

Matúš Kukan matus.kukan at collabora.com
Tue Apr 8 01:32:37 PDT 2014 

 RepositoryExternal.mk            |    2 +-
 coinmp/ExternalPackage_coinmp.mk |    2 +-
 coinmp/ExternalProject_coinmp.mk |    1 +
 configure.ac                     |   14 +++++++++-----
 4 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit e0a6759fd8b891e86ce0b35cfbfb11e7c3a2d0da
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Apr 8 10:32:27 2014 +0200

    mpl-subset changes
    
    Change-Id: Iebd435a40fb61ddb248d7bbb50f55b92b16f0141

diff --git a/configure.ac b/configure.ac
index e9e55e1..51d2f5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8517,7 +8517,7 @@ AC_MSG_CHECKING([whether to plug browser plugins into LibreOffice documents])
 # Obviously no such thing on iOS or Android. Also not possible when building
 # 64-bit OS X code as the plugin code uses QuickTime and Carbon.
 if test "$_os" != Android -a "$_os" != iOS -a \( $_os != Darwin -o "$BITNESS_OVERRIDE" = "" \) -a \
-        "$enable_headless" != yes
+        "$enable_headless" != yes -a "$enable_mpl_subset" != yes
 then
     AC_MSG_RESULT([yes])
     ENABLE_NPAPI_FROM_BROWSER=YES
@@ -8531,8 +8531,8 @@ dnl ===================================================================
 dnl Check for NPAPI interface to plug LibreOffice into browser windows
 dnl ===================================================================
 AC_MSG_CHECKING([whether to plug LibreOffice into browser windows])
-if test "$_os" == WINNT -o "$_os" != Android -a "$_os" != Darwin -a "$_os" != iOS -a \
-        "$enable_headless" != yes -a "$enable_gtk" != no
+if test "$enable_mpl_subset" != yes -a \( "$_os" = WINNT -o "$_os" != Android -a "$_os" != Darwin -a "$_os" != iOS -a \
+        "$enable_headless" != yes -a "$enable_gtk" != no \)
 then
     AC_MSG_RESULT([yes])
     ENABLE_NPAPI_INTO_BROWSER=YES
commit b177b928b5dd0afcc51d8964086cc8a23b504d65
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Mon Apr 7 09:28:06 2014 +0200

    Find apr and serf libraries in --enable-dbgutil Windows build.
    
    Change-Id: I06af5605ac5cf8606864b7c42527aa567571341a
    (cherry picked from commit 702d79a3f8fd3c5e4b433195908317075c87ad9d)

diff --git a/configure.ac b/configure.ac
index df9c949..e9e55e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8662,14 +8662,18 @@ serf)
                              ["-I${WORKDIR}/UnpackedTarball/apr/include -I${WORKDIR}/UnpackedTarball/apr_util/include"],
                              ["-L${WORKDIR}/UnpackedTarball/apr/.libs -lapr-1 -L${WORKDIR}/UnpackedTarball/apr_util/.libs -laprutil-1"])
     if test "$COM" = "MSC"; then
-        APR_LIBS="${WORKDIR}/UnpackedTarball/apr/LibR/apr-1.lib ${WORKDIR}/UnpackedTarball/apr_util/LibR/aprutil-1.lib"
+        APR_LIB_DIR="LibR"
+        test -n "MSVC_USE_DEBUG_RUNTIME" && APR_LIB_DIR="LibD"
+        APR_LIBS="${WORKDIR}/UnpackedTarball/apr/${APR_LIB_DIR}/apr-1.lib ${WORKDIR}/UnpackedTarball/apr_util/${APR_LIB_DIR}/aprutil-1.lib"
     fi
 
     # Check for system serf
     libo_CHECK_SYSTEM_MODULE([serf],[SERF],[serf-1 >= 1.1.0],["-I${WORKDIR}/UnpackedTarball/serf"],
                              ["-L${WORKDIR}/UnpackedTarball/serf/.libs -lserf-1"])
     if test "$COM" = "MSC"; then
-        SERF_LIBS="${WORKDIR}/UnpackedTarball/serf/Release/serf-1.lib"
+        SERF_LIB_DIR="Release"
+        test -n "MSVC_USE_DEBUG_RUNTIME" && SERF_LIB_DIR="Debug"
+        SERF_LIBS="${WORKDIR}/UnpackedTarball/serf/${SERF_LIB_DIR}/serf-1.lib"
     fi
     ;;
 neon)
commit b61716b25da6fca2985f5216bdfd25b6c7335745
Author: Tomofumi Yagi <yagit at mknada.sakura.ne.jp>
Date:   Sat Apr 5 12:02:38 2014 +0900

    Fix Windows build(external/coinmp)
    
    This patch fixes the problem that a linker misses CoinMP.dll.
    The problem will occurs when we use --enable-dbgutil option.
    
    Reviewed-on: https://gerrit.libreoffice.org/8854
    Reviewed-by: Matúš Kukan <matus.kukan at collabora.com>
    Tested-by: Matúš Kukan <matus.kukan at collabora.com>
    (cherry picked from commit cddbec75d402e260d6997ad69377346a8aa5774a)
    
    Change-Id: If6cec0f9705db2af33cb9a69d9440e3053c5979a

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3571b2b..8e549b3 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1747,7 +1747,7 @@ define gb_LinkTarget__use_coinmp
 $(call gb_LinkTarget_use_package,$(1),coinmp)
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,coinmp)/CoinMP/MSVisualStudio/v9/release/CoinMP.lib \
+	$(call gb_UnpackedTarball_get_dir,coinmp)/CoinMP/MSVisualStudio/v9/$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
diff --git a/coinmp/ExternalPackage_coinmp.mk b/coinmp/ExternalPackage_coinmp.mk
index 6ce493b..9f6793a 100644
--- a/coinmp/ExternalPackage_coinmp.mk
+++ b/coinmp/ExternalPackage_coinmp.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,coinmp,coinmp))
 $(eval $(call gb_ExternalPackage_use_external_project,coinmp,coinmp))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_ExternalPackage_add_library_for_install,coinmp,bin/CoinMP.dll,CoinMP/MSVisualStudio/v9/release/CoinMP.dll))
+$(eval $(call gb_ExternalPackage_add_library_for_install,coinmp,bin/CoinMP.dll,CoinMP/MSVisualStudio/v9/$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.dll))
 else ifeq ($(OS),MACOSX)
 $(eval $(call gb_ExternalPackage_add_library_for_install,coinmp,lib/libCbc.3.dylib,Cbc/src/.libs/libCbc.3.dylib))
 $(eval $(call gb_ExternalPackage_add_library_for_install,coinmp,lib/libCbcSolver.3.dylib,Cbc/src/.libs/libCbcSolver.3.dylib))
commit b4071b429c1619e85903aeed11100f39b579bac2
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Apr 4 18:12:16 2014 +0200

    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 at gmail.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 6731f6c36faf64ab4522f0ffe2045c794849fabe)

diff --git a/coinmp/ExternalProject_coinmp.mk b/coinmp/ExternalProject_coinmp.mk
index b66e877..c18f2d5 100644
--- a/coinmp/ExternalProject_coinmp.mk
+++ b/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) \
 	)

More information about the Libreoffice-commits mailing list