[Libreoffice-commits] core.git: 2 commits - RepositoryExternal.mk solenv/gbuild

[Michael Stahl]

 RepositoryExternal.mk                  |    6 ++++++
 solenv/gbuild/platform/com_GCC_defs.mk |    4 ++--
 solenv/gbuild/platform/macosx.mk       |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit bfaea05b711ff3e204429ce9bd26c5fe63b0b687
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Oct 24 01:34:05 2013 +0200

    gbuild: gb_Helper_extend_ld_path was rather broken...
    
    Change-Id: I03b2d8590fada4709f2223dcd05760bf2fddb196

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index c747854..3f9600a 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -187,9 +187,9 @@ endif
 
 gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}"$(OUTDIR_FOR_BUILD)/lib:$(INSTROOT_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER_FOR_BUILD):$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER_FOR_BUILD)"
 
-# $(1): list of directory pathnames to append at the end of the ld path
+# $(1): list of : separated directory pathnames to append to the ld path
 define gb_Helper_extend_ld_path
-$(gb_Helper_set_ld_path)$(foreach dir,$(1),:$(dir))
+$(gb_Helper_set_ld_path):$(1)
 endef
 
 # Convert path to file URL.
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 03e65ad..0389eed 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -279,7 +279,7 @@ endef
 # CppunitTest class
 
 gb_CppunitTest_CPPTESTPRECOMMAND := \
-	$(call gb_Helper_extend_ld_path,$(gb_Library_DLLDIR) $(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs)
+	$(call gb_Helper_extend_ld_path,$(gb_Library_DLLDIR):$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs)
 gb_CppunitTest_get_filename = libtest_$(1).dylib
 gb_CppunitTest_get_ilibfilename = $(gb_CppunitTest_get_filename)
 
commit b7d8ca8af95ac23f19cf1b63d1720cb0dd561bce
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Oct 24 01:25:59 2013 +0200

    un-break lpsolve for MSC
    
    Change-Id: Iccf8f5572530412ef72f802e968778826a73d886

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e4de1d0..ebdc619 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1703,9 +1703,15 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 
 define gb_LinkTarget__use_lpsolve
 $(call gb_LinkTarget_use_unpacked,$(1),lpsolve)
+ifeq ($(COM),MSC)
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(call gb_UnpackedTarball_get_dir,lpsolve)/lpsolve55/lpsolve55.lib \
+)
+else
 $(call gb_LinkTarget_add_libs,$(1),\
 	-L$(call gb_UnpackedTarball_get_dir,lpsolve)/lpsolve55 -llpsolve55 \
 )
+endif
 $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,lpsolve) \
 	$$(INCLUDE) \