[Libreoffice-commits] core.git: 3 commits - download.lst external/libmspub solenv/gbuild

[Michael Stahl]

 download.lst                                  |    2 +-
 external/libmspub/ExternalProject_libmspub.mk |    2 +-
 solenv/gbuild/Module.mk                       |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e2f13f0e7f70807052b753996dfaf5a99fc2ac89
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Nov 14 22:30:21 2013 +0100

    download.lst: export ODFGEN_TARBALL to unbreak "odfgen.clean"
    
    Change-Id: I7b7138904cde5da862524096732173281b1a71f2

diff --git a/download.lst b/download.lst
index ddccc9c..f4a2206 100644
--- a/download.lst
+++ b/download.lst
@@ -11,7 +11,7 @@ export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2
 MWAW_MD5SUM := d794625f156a9fb1c53b3f8a8aa13b5e
 export MWAW_TARBALL := libmwaw-0.2.0.tar.bz2
 ODFGEN_MD5SUM := 9cafe7f50a3b2c5ebd2dc9c6c509d2b4
-ODFGEN_TARBALL := libodfgen-0.0.3.tar.bz2
+export ODFGEN_TARBALL := libodfgen-0.0.3.tar.bz2
 VISIO_MD5SUM := 82628333418f101a20cd21f980cf9f40
 export VISIO_TARBALL := libvisio-0.0.31.tar.bz2
 FIREBIRD_MD5SUM := 21154d2004e025c8a3666625b0357bb5
commit 3be673ca8453782727beb501aa60e75e8375ea78
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Nov 14 22:06:39 2013 +0100

    gbuild: fix typo in Module clean rule
    
    regression from 04dead1c6b9fd8ea24b27d2c5824ae889a2fac66
    
    Change-Id: I623ec25a0666cd3cac1d4f6371e6460a25faa6c4

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 382062f..dd35658 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -65,7 +65,7 @@ $(call gb_Module_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),MOD,5)
 	$(call gb_Output_announce_title,module $* cleared.)
 	-$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_Module_get_target,$*) $(call gb_Module_get_nonl10n_target,$*) $(call gb_Module_get_l10n_target,$*) $(call gb_Module_get_check_target,$*) $(call gb_Module_get_slowcheck_target,$*) $(call gb_Module_get_subsequentcheck_target,$*)
+		rm -f $(call gb_Module_get_target,$*) $(call gb_Module_get_nonl10n_target,$*) $(call gb_Module_get_l10n_target,$*) $(call gb_Module_get_check_target,$*) $(call gb_Module_get_slowcheck_target,$*) $(call gb_Module_get_subsequentcheck_target,$*))
 
 $(call gb_Module_get_l10n_target,%) :
 	$(call gb_Output_announce,$*,$(true),LOC,5)
commit 7b3c67e69afb5ad4d426e349a23243b9be12ce9d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Nov 14 22:37:27 2013 +0100

    libmspub: fix the quoting
    
    Change-Id: I448d7ec788ed93c71d67ea6785ec8c463a936971

diff --git a/external/libmspub/ExternalProject_libmspub.mk b/external/libmspub/ExternalProject_libmspub.mk
index 58161fe..f0b862a 100644
--- a/external/libmspub/ExternalProject_libmspub.mk
+++ b/external/libmspub/ExternalProject_libmspub.mk
@@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) :
 			--disable-debug \
 			--disable-werror \
 			--disable-weffc \
-			$(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),CXXFLAGS=$(BOOST_CPPFLAGS)) \
+			CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS))" \
 			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
 			$(if $(VERBOSE)$(verbose),V=1) \