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

[Peter Foley]

 solenv/gbuild/LinkTarget.mk            |    5 ++++-
 solenv/gbuild/platform/com_GCC_defs.mk |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 1c0ebe9e0057e6900274f223ff604ee6212e363f
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Wed Apr 24 20:23:24 2013 -0400

    fixes for libmerged
    
    Change-Id: I77c7ebcbba4fd2c78d66d6088bbbf4a3122f7c8a

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 35896fe..b2fb19c 100755
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -454,7 +454,9 @@ $(call gb_LinkTarget_get_target,Library/%.exports) : $(gb_Library_OUTDIRLOCATION
 $(call gb_LinkTarget_get_target,%) : $(call gb_LinkTarget_get_headers_target,%) $(gb_Helper_MISCDUMMY)
 	$(if $(filter $*,$(foreach lib,$(gb_MERGEDLIBS) $(gb_URELIBS),$(call gb_Library_get_linktargetname,$(lib)))),\
 	$(if $(filter $(true),$(call gb_LinkTarget__is_build_lib,$*)),\
-	$(call gb_LinkTarget__command,$@,$*),mkdir -p $(dir $@) && echo invalid > $@),$(call gb_LinkTarget__command,$@,$*))
+	$(call gb_LinkTarget__command,$@,$*),\
+	mkdir -p $(dir $@) && echo invalid > $@ \
+	$(if $(SOVERSION),&& echo invalid > $@.$(SOVERSION))),$(call gb_LinkTarget__command,$@,$*))
 	$(call gb_LinkTarget__command_objectlist,$@,$*)
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -870,6 +872,7 @@ gb_BUILD_HELPER_LIBS := basegfx \
 
 gb_BUILD_HELPER_TOOLS := cppumaker \
 	idlc \
+	reg2unoidl \
 	regmerge \
 	rsc \
 	svidl
commit c06c0517c15225357f59ae828f6b18990906ae19
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Wed Apr 24 20:22:54 2013 -0400

    libpython.so is now in instdir
    
    Change-Id: Ib1b1a853d265a28bfab19c0fa25b778fcec92ba6

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index e6c2ee6..47f7191 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -187,7 +187,7 @@ else
 gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH
 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"
+gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}"$(OUTDIR_FOR_BUILD)/lib:$(INSTDIR)/program"
 
 # $(1): list of directory pathnames to append at the end of the ld path
 define gb_Helper_extend_ld_path