RepositoryExternal.mk | 2 +- configure.ac | 8 ++++++-- external/coinmp/ExternalPackage_coinmp.mk | 2 +- external/coinmp/ExternalProject_coinmp.mk | 1 + 4 files changed, 9 insertions(+), 4 deletions(-)
New commits: commit 6d81c8ee3eca3e49cb17f4fa3b6f5732f0facae8 Author: Matúš Kukan <matus.ku...@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 69036cd..54fd9f6 100644 --- a/configure.ac +++ b/configure.ac @@ -9283,14 +9283,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 bdf04730079523303a7c10c7af97ee5f67ad0a92 Author: Tomofumi Yagi <ya...@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. Change-Id: If6cec0f9705db2af33cb9a69d9440e3053c5979a Reviewed-on: https://gerrit.libreoffice.org/8854 Reviewed-by: Matúš Kukan <matus.ku...@collabora.com> Tested-by: Matúš Kukan <matus.ku...@collabora.com> (cherry picked from commit cddbec75d402e260d6997ad69377346a8aa5774a) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 23bee81..c932194 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1891,7 +1891,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/external/coinmp/ExternalPackage_coinmp.mk b/external/coinmp/ExternalPackage_coinmp.mk index de01822..bbea3dd 100644 --- a/external/coinmp/ExternalPackage_coinmp.mk +++ b/external/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_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,CoinMP/MSVisualStudio/v9/release/CoinMP.dll)) +$(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 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)) commit c06d624c81bafba1b61052aa5078d10f023e276b Author: Michael Stahl <mst...@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 <mostthings...@gmail.com> Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> (cherry picked from commit 6731f6c36faf64ab4522f0ffe2045c794849fabe) diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk index b66e877..c18f2d5 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) \ )
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits