[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - 2 commits - clucene/prj solenv/gbuild

[David Tardon]

 clucene/prj/build.lst                   |    2 +-
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 978ad4e6478f4dba2a9f3fffdcdaaaa41462e20c
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Aug 2 11:32:42 2012 +0200

    fix Library/LinkTarget build on mingw
    
    Parallel MinGW build broke in clucene every now and then because the
    link target tried to put map file directly into $(OUTDIR)/bin, which did
    not exist yet (and actually nothing in Library depends on it, so I guess
    it was just luckily created in time by delivery of soltools in the cases
    where the build succeeded).
    
    The map file is now created in $(WORKDIR) (as it should be) and then
    delivered through AUXTARGETS.
    
    Change-Id: I62373f0b71a6c4f3b59fa779f9ec48154485a174

diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 976df76..ec8f02b 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -163,7 +163,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(if $(LINKED_STATIC_LIBS),-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group) \
 		$(patsubst lib%.a,-l%,$(patsubst lib%.dll.a,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_implibname,$(lib))))) \
 		$(LIBS) \
-		-Wl$(COMMA)-Map$(COMMA)$(basename $(DLLTARGET)).map \
+		-Wl$(COMMA)-Map$(COMMA)$(dir $(1))$(notdir $(basename $(DLLTARGET)).map) \
 		-Wl$(COMMA)--out-implib$(COMMA)$(1) \
 		-o $(dir $(1))/$(notdir $(DLLTARGET))))
 endef
@@ -298,16 +298,16 @@ gb_Library_IARCEXT := .a
 gb_Library_ILIBEXT := .lib
 
 define gb_Library_Library_platform
-$(call gb_LinkTarget_set_dlltarget,$(2),$(OUTDIR)/bin/$(notdir $(3)))
+$(call gb_LinkTarget_set_dlltarget,$(2),$(3))
 
 $(call gb_LinkTarget_add_auxtargets,$(2),\
 	$(patsubst %.dll,%.map,$(3)) \
 )
 
-$(call gb_Library_get_target,$(1)) \
-$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir $(3))
+$(call gb_Library_get_target,$(1)) :| $(OUTDIR)/bin/.dir
 
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))
+$(call gb_Library_get_target,$(1)) \
+$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir $(3)) $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.map,$(3)))
 
 $(call gb_Library_add_default_nativeres,$(1),$(1)/default)
 
commit bee8f3a37b7ce1851635fb5247b6ff19fc1ce0a6
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Aug 2 11:31:46 2012 +0200

    clucene build needs solenv
    
    Change-Id: I5e41370b54a6054b9a488ae523a9d83b47f20415

diff --git a/clucene/prj/build.lst b/clucene/prj/build.lst
index c33dcb2..9e008cf 100644
--- a/clucene/prj/build.lst
+++ b/clucene/prj/build.lst
@@ -1,3 +1,3 @@
-cl	clucene : ZLIB:zlib BOOST:boost NULL
+cl	clucene : ZLIB:zlib BOOST:boost solenv NULL
 cl	clucene			usr1	-   all	cl_mkout NULL
 cl	clucene\prj		nmake	-   all	cl_prj NULL