[Libreoffice-commits] core.git: libmspub/ExternalProject_libmspub.mk liborcus/ExternalProject_liborcus.mk libvisio/ExternalProject_libvisio.mk

[Stephan Bergmann]

 libmspub/ExternalProject_libmspub.mk |    2 +-
 liborcus/ExternalProject_liborcus.mk |    2 +-
 libvisio/ExternalProject_libvisio.mk |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit be9bf4801bc157ec1bf522500772222de914a212
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Feb 17 11:55:31 2013 +0100

    Improve support for --with-system-boost --with-boost=... in external modules
    
    ...though it would arguably be better to just pass along --with-boost=... where
    applicable.  (liborcus' orcus-xml-dump links against -lboost_system, so needs
    BOOST_LDFLAGS passed in in addition to BOOST_CPPFLAGS.)
    
    Change-Id: I6467d0f453d68494b75559a7eb61f865f9513b50

diff --git a/libmspub/ExternalProject_libmspub.mk b/libmspub/ExternalProject_libmspub.mk
index 14cc85e..9fdcce1 100644
--- a/libmspub/ExternalProject_libmspub.mk
+++ b/libmspub/ExternalProject_libmspub.mk
@@ -72,7 +72,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)) \
+		$(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost),CXXFLAGS=$(BOOST_CPPFLAGS)) \
 		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 	&& (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
 	&& touch $@
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index aea4c87..2bbf2e9 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -60,7 +60,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
 		--disable-spreadsheet-model \
 		--disable-werror \
 		$(if $(filter LINUX FREEBSD OPENBSD NETBSD DRAGONFLY ANDROID,$(OS)),$(if $(gb_ENABLE_DBGUTIL),CPPFLAGS=-D_GLIBCXX_DEBUG)) \
-		$(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost)) \
+		$(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost),CXXFLAGS=$(BOOST_CPPFLAGS) LDFLAGS=$(BOOST_LDFLAGS)) \
 		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 	&& $(MAKE) \
 	&& touch $@
diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk
index c133158..deee499 100644
--- a/libvisio/ExternalProject_libvisio.mk
+++ b/libvisio/ExternalProject_libvisio.mk
@@ -68,7 +68,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
 		--without-docs \
 		--disable-debug \
 		--disable-werror \
-		CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost)) \
+		CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS)) \
 		$(if $(filter NO,$(SYSTEM_LIBXML)),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
 		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 	&& (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \