external/libcdr/ExternalProject_libcdr.mk | 2 +-
external/libetonyek/ExternalProject_libetonyek.mk | 2 +-
external/libmspub/ExternalProject_libmspub.mk | 2 +-
external/libmwaw/ExternalProject_libmwaw.mk | 2 +-
external/libodfgen/ExternalProject_libodfgen.mk | 2 +-
external/libvisio/ExternalProject_libvisio.mk | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 2b24bf23697f2461c5b480814240daf82f2929ff
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Nov 14 21:53:21 2013 +0100
more externals need config_host for boost
Change-Id: I0cfb09240a2e525cbd57b099b6e52eeabcc57d3f
diff --git a/external/libcdr/ExternalProject_libcdr.mk
b/external/libcdr/ExternalProject_libcdr.mk
index 9dda27f..9ec9154 100644
--- a/external/libcdr/ExternalProject_libcdr.mk
+++ b/external/libcdr/ExternalProject_libcdr.mk
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
--disable-debug \
--disable-werror \
--disable-weffc \
- CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call
gb_UnpackedTarball_get_dir,boost),$(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) \
diff --git a/external/libetonyek/ExternalProject_libetonyek.mk
b/external/libetonyek/ExternalProject_libetonyek.mk
index c4d1368..b4b5589 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
--disable-werror \
--disable-weffc \
--without-tools \
- BOOST_CFLAGS="$(if $(filter
NO,$(SYSTEM_BOOST)),-I$(call
gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \
+ BOOST_CFLAGS="$(if $(filter
NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost)
-I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS))" \
XML_CFLAGS="$(if $(filter NO,$(SYSTEM_LIBXML)),-I$(call
gb_UnpackedTarball_get_dir,xml2)/include,$(LIBXML_CFLAGS))" \
XML_LIBS="$(LIBXML_LIBS)" \
$(if $(filter
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
diff --git a/external/libmspub/ExternalProject_libmspub.mk
b/external/libmspub/ExternalProject_libmspub.mk
index 9da4dc5..58161fe 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),CXXFLAGS=$(BOOST_CPPFLAGS)) \
+ $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call
gb_UnpackedTarball_get_dir,boost)
-I$(BUILDDIR)/config_$(gb_Side),CXXFLAGS=$(BOOST_CPPFLAGS)) \
$(if $(filter
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(if $(VERBOSE)$(verbose),V=1) \
diff --git a/external/libmwaw/ExternalProject_libmwaw.mk
b/external/libmwaw/ExternalProject_libmwaw.mk
index b838339..c1b5c8d 100644
--- a/external/libmwaw/ExternalProject_libmwaw.mk
+++ b/external/libmwaw/ExternalProject_libmwaw.mk
@@ -31,7 +31,7 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) :
--without-docs \
--disable-debug \
--disable-werror \
- CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call
gb_UnpackedTarball_get_dir,boost),$(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) \
diff --git a/external/libodfgen/ExternalProject_libodfgen.mk
b/external/libodfgen/ExternalProject_libodfgen.mk
index eea9ad1..dfc44b4 100644
--- a/external/libodfgen/ExternalProject_libodfgen.mk
+++ b/external/libodfgen/ExternalProject_libodfgen.mk
@@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
--disable-debug \
--disable-werror \
--disable-weffc \
- CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call
gb_UnpackedTarball_get_dir,boost),$(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 && \
$(if $(VERBOSE)$(verbose),V=1) \
diff --git a/external/libvisio/ExternalProject_libvisio.mk
b/external/libvisio/ExternalProject_libvisio.mk
index ea5286b..ea6b851 100644
--- a/external/libvisio/ExternalProject_libvisio.mk
+++ b/external/libvisio/ExternalProject_libvisio.mk
@@ -34,7 +34,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),$(BOOST_CPPFLAGS)) \
+ CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call
gb_UnpackedTarball_get_dir,boost)
-I$(BUILDDIR)/config_$(gb_Side),$(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 && \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
