mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

externals using boost now need config_host to find config_global.h

Browse Source 
... why didn't GCC 4.1 have #pragma diagnostic push?

Change-Id: Iedb33d6451e46dc12e137bcd4dccd592c7771c23
This commit is contained in:
Michael Stahl
2013-11-14 21:37:58 +01:00
parent 1b5f5b0325
commit d5d307d647
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
external/libebook/ExternalProject_libebook.mk vendored
View File

@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libebook,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))" \
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)) \

2
external/liborcus/ExternalProject_liborcus.mk vendored
View File

@@ -53,7 +53,7 @@ liborcus_CPPFLAGS+=$(ZLIB_CFLAGS)
endif
# patched boost needs to find config_global.h
ifeq ($(SYSTEM_BOOST),NO)
liborcus_CPPFLAGS += -I$(SRCDIR)/config_$(gb_Side)
liborcus_CPPFLAGS += -I$(BUILDDIR)/config_$(gb_Side)
endif
#
# OSes that use the GNU C++ library need to use -D_GLIBCXX_DEBUG in

2
external/libwps/ExternalProject_libwps.mk vendored
View File

@@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,libwps,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) \