[Libreoffice-commits] core.git: 2 commits - configure.ac external/boost external/firebird external/libabw external/libcdr external/libebook external/libetonyek external/libgltf external/libmspub external/liborcus external/libpagemaker external/librevenge external/libvisio
Michael Stahl
mstahl at redhat.com
Mon May 30 07:49:28 UTC 2016
configure.ac | 1
external/boost/UnpackedTarball_boost.mk | 1
external/boost/boost.std.move.patch | 21 ------------------
external/firebird/ExternalProject_firebird.mk | 2 -
external/libabw/ExternalProject_libabw.mk | 3 --
external/libcdr/ExternalProject_libcdr.mk | 2 -
external/libebook/ExternalProject_libebook.mk | 2 -
external/libetonyek/ExternalProject_libetonyek.mk | 2 -
external/libgltf/ExternalProject_libgltf.mk | 2 -
external/libmspub/ExternalProject_libmspub.mk | 2 -
external/liborcus/ExternalProject_liborcus.mk | 2 -
external/libpagemaker/ExternalProject_libpagemaker.mk | 2 -
external/librevenge/ExternalProject_librevenge.mk | 2 -
external/libvisio/ExternalProject_libvisio.mk | 2 -
14 files changed, 12 insertions(+), 34 deletions(-)
New commits:
commit aa0b05f1856c1be670208f7c9cbc8d8830b1e349
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri May 27 15:29:40 2016 +0200
boost: remove boost.std.move.patch
Apparently required only on obsolete/unsupported Mac OS X versions.
Change-Id: I68540e3ac0d6830ed42854def0367a17f15feacd
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk
index e446e99..bedfc9a 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -43,7 +43,6 @@ boost_patches += boost_1_44_0-unused-parameters.patch
endif
boost_patches += boost.auto_link.patch
-boost_patches += boost.std.move.patch
boost_patches += boost.wunused.patch
boost_patches += ubsan.patch.0
diff --git a/external/boost/boost.std.move.patch b/external/boost/boost.std.move.patch
deleted file mode 100644
index 7c0dfb9..0000000
--- a/external/boost/boost.std.move.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru boost.orig/boost/config/compiler/clang.hpp boost/boost/config/compiler/clang.hpp
---- foo/misc/boost.orig/boost/config/compiler/clang.hpp 2015-05-07 19:11:52.000000000 +0200
-+++ foo/misc/boost/boost/config/compiler/clang.hpp 2015-07-18 22:40:56.304941957 +0200
-@@ -10,6 +10,8 @@
-
- #define BOOST_HAS_PRAGMA_ONCE
-
-+#include <utility>
-+
- // Detecting `-fms-extension` compiler flag assuming that _MSC_VER defined when that flag is used.
- #if defined (_MSC_VER) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 4))
- # define BOOST_HAS_PRAGMA_DETECT_MISMATCH
-@@ -161,7 +163,7 @@
- # define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
- #endif
-
--#if !__has_feature(cxx_rvalue_references)
-+#if !__has_feature(cxx_rvalue_references) || (defined(__APPLE__) && !defined(_LIBCPP_VERSION))
- # define BOOST_NO_CXX11_RVALUE_REFERENCES
- #endif
-
commit e355e54f2fddcf3146f33c9690e580e6b77aacef
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri May 27 15:21:50 2016 +0200
configure: set BOOST_CPPFLAGS also in --without-system-boost case
Simplify the makefiles.
Change-Id: Ia695961e936e4a1ffdaff73eb56adc3c3905ed0c
diff --git a/configure.ac b/configure.ac
index b9565a9..97056e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8838,6 +8838,7 @@ else
AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE BOOST"
SYSTEM_BOOST=
+ BOOST_CPPFLAGS="-I${WORKDIR}/UnpackedTarball/boost"
fi
AC_SUBST(SYSTEM_BOOST)
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk
index cd89dfb..11817ee 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -49,7 +49,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
" \
&& export CXXFLAGS=" \
$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS), \
- -I$(call gb_UnpackedTarball_get_dir,boost) \
+ $(BOOST_CPPFLAGS) \
-L$(call gb_UnpackedTarball_get_dir,boost)/source/lib \
) \
$(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \
diff --git a/external/libabw/ExternalProject_libabw.mk b/external/libabw/ExternalProject_libabw.mk
index f2369c2..e174f9e 100644
--- a/external/libabw/ExternalProject_libabw.mk
+++ b/external/libabw/ExternalProject_libabw.mk
@@ -34,8 +34,7 @@ $(call gb_ExternalProject_get_state_target,libabw,build) :
--disable-debug \
--disable-werror \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
- CXXFLAGS="$(CXXFLAGS) $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\
- -I$(call gb_UnpackedTarball_get_dir,boost)) \
+ CXXFLAGS="$(CXXFLAGS) $(BOOST_CPPFLAGS) \
-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) \
diff --git a/external/libcdr/ExternalProject_libcdr.mk b/external/libcdr/ExternalProject_libcdr.mk
index 4686f5c..86f93da 100644
--- a/external/libcdr/ExternalProject_libcdr.mk
+++ b/external/libcdr/ExternalProject_libcdr.mk
@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
--disable-werror \
--disable-weffc \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
- CXXFLAGS="$(CXXFLAGS) $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
+ CXXFLAGS="$(CXXFLAGS) $(BOOST_CPPFLAGS) \
-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) \
diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk
index 5ef585a..45b15f2 100644
--- a/external/libebook/ExternalProject_libebook.mk
+++ b/external/libebook/ExternalProject_libebook.mk
@@ -38,7 +38,7 @@ $(call gb_ExternalProject_get_state_target,libebook,build) :
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
--disable-werror \
--disable-weffc \
- CXXFLAGS="$(CXXFLAGS) $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
+ CXXFLAGS="$(CXXFLAGS) $(BOOST_CPPFLAGS) \
-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \
XML_CFLAGS="$(LIBXML_CFLAGS)" \
XML_LIBS="$(LIBXML_LIBS)" \
diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk
index 963f48e..41b793f 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -47,7 +47,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
$(if $(filter LINUX,$(OS)), \
'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \
- CPPFLAGS="$(CPPFLAGS) $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
+ CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \
CXXFLAGS="$(CXXFLAGS) $(CXXFLAGS_CXX11) $(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))" \
LANGTAG_CFLAGS="$(LIBLANGTAG_CFLAGS)" \
LANGTAG_LIBS="$(LIBLANGTAG_LIBS)" \
diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk
index fcc82af..57c01d0 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -66,7 +66,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
--with-pic \
$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
--disable-werror \
- BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
+ BOOST_CFLAGS="$(BOOST_CPPFLAGS)" \
GLEW_CFLAGS="$(if $(SYSTEM_GLEW),$(GLEW_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,glew)/include) -DGLEW_NO_GLU" \
GLM_CFLAGS="$(if $(SYSTEM_GLM),$(GLM_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,glm))" \
$(if $(libgltf_CPPFLAGS),CPPFLAGS='$(libgltf_CPPFLAGS)') \
diff --git a/external/libmspub/ExternalProject_libmspub.mk b/external/libmspub/ExternalProject_libmspub.mk
index c200ba3..a168a62 100644
--- a/external/libmspub/ExternalProject_libmspub.mk
+++ b/external/libmspub/ExternalProject_libmspub.mk
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) :
--disable-werror \
--disable-weffc \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
- CXXFLAGS="$(CXXFLAGS) $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
+ CXXFLAGS="$(CXXFLAGS) $(BOOST_CPPFLAGS) \
-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) \
diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
index 580ef847..1a3c309 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -70,7 +70,7 @@ ifeq ($(COM),MSC)
liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)
endif
ifeq ($(SYSTEM_BOOST),)
-liborcus_CXXFLAGS+=-I$(WORKDIR)/UnpackedTarball/boost
+liborcus_CXXFLAGS+=${BOOST_CPPFLAGS}
else
liborcus_LDFLAGS+=$(BOOST_LDFLAGS)
endif
diff --git a/external/libpagemaker/ExternalProject_libpagemaker.mk b/external/libpagemaker/ExternalProject_libpagemaker.mk
index 9f8fac8..8bd4d68 100644
--- a/external/libpagemaker/ExternalProject_libpagemaker.mk
+++ b/external/libpagemaker/ExternalProject_libpagemaker.mk
@@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,libpagemaker,build) :
--disable-werror \
--disable-weffc \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
- CXXFLAGS="$(CXXFLAGS) $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
+ CXXFLAGS="$(CXXFLAGS) $(BOOST_CPPFLAGS) \
-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) \
diff --git a/external/librevenge/ExternalProject_librevenge.mk b/external/librevenge/ExternalProject_librevenge.mk
index 3c2efc0..903ee55 100644
--- a/external/librevenge/ExternalProject_librevenge.mk
+++ b/external/librevenge/ExternalProject_librevenge.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,librevenge,build) :
--disable-generators \
--without-docs \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
- CXXFLAGS="$(CXXFLAGS) $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
+ CXXFLAGS="$(CXXFLAGS) $(BOOST_CPPFLAGS)" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
&& $(MAKE) \
diff --git a/external/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk
index 5ce63fb..884fde8 100644
--- a/external/libvisio/ExternalProject_libvisio.mk
+++ b/external/libvisio/ExternalProject_libvisio.mk
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
--disable-werror \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
- CXXFLAGS="$(CXXFLAGS) $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
+ CXXFLAGS="$(CXXFLAGS) $(BOOST_CPPFLAGS)" \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)
More information about the Libreoffice-commits
mailing list