You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by tr...@apache.org on 2019/11/05 18:44:31 UTC
[openoffice] branch trunk updated: Set compiler feature flags more
correctly for recent gcc versions.
This is an automated email from the ASF dual-hosted git repository.
truckman pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6dcced1 Set compiler feature flags more correctly for recent gcc versions.
6dcced1 is described below
commit 6dcced134bc77f38a4758b0d706ce355eaae6ac6
Author: Don Lewis <tr...@apache.org>
AuthorDate: Tue Nov 5 10:51:10 2019 -0800
Set compiler feature flags more correctly for recent gcc versions.
---
main/boost/boost_1_55_0.patch | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/main/boost/boost_1_55_0.patch b/main/boost/boost_1_55_0.patch
index 6cec7bb..df9b8ec 100644
--- a/main/boost/boost_1_55_0.patch
+++ b/main/boost/boost_1_55_0.patch
@@ -328,22 +328,34 @@ diff -ur misc/boost_1_55_0/boost/unordered/detail/unique.hpp misc/build/boost_1_
////////////////////////////////////////////////////////////////////////
diff -ur misc/boost_1_55_0/boost/config/compiler/gcc.hpp misc/build/boost_1_55_0/boost/config/compiler/gcc.hpp
--- misc/boost_1_55_0/boost/config/compiler/gcc.hpp 2013-09-17 09:55:51.000000000 -0700
-+++ misc/build/boost_1_55_0/boost/config/compiler/gcc.hpp 2016-09-02 19:15:48.775411000 -0700
-@@ -137,7 +137,7 @@
++++ misc/build/boost_1_55_0/boost/config/compiler/gcc.hpp 2019-11-04 09:59:20.741944674 -0800
+@@ -137,14 +137,18 @@
// C++0x features in 4.3.n and later
//
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 2)) && defined(__GXX_EXPERIMENTAL_CXX0X__)
-+#if ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 2)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (__GNUC__ > 6) || (__GNUC__ == 6 && __GNUC_MINOR__ > 0)
++#if ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 2)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (__cplusplus >= 201103L)
// C++0x features are only enabled when -std=c++0x or -std=gnu++0x are
// passed on the command line, which in turn defines
// __GXX_EXPERIMENTAL_CXX0X__.
-@@ -153,7 +153,7 @@
+ # define BOOST_HAS_DECLTYPE
+ # define BOOST_HAS_RVALUE_REFS
+ # define BOOST_HAS_STATIC_ASSERT
+-# define BOOST_HAS_VARIADIC_TMPL
++# if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 4))
++# define BOOST_HAS_VARIADIC_TMPL
++# else
++# define BOOST_NO_CXX11_VARIADIC_TEMPLATES
++# endif
+ #else
+ # define BOOST_NO_CXX11_DECLTYPE
+ # define BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
+@@ -153,7 +157,7 @@
// Variadic templates compiler:
// http://www.generic-programming.org/~dgregor/cpp/variadic-templates.html
-# if defined(__VARIADIC_TEMPLATES) || (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4) && defined(__GXX_EXPERIMENTAL_CXX0X__))
-+# if defined(__VARIADIC_TEMPLATES) || ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 2)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (__GNUC__ > 6) || (__GNUC__ == 6 && __GNUC_MINOR__ > 0)
++# if defined(__VARIADIC_TEMPLATES)
# define BOOST_HAS_VARIADIC_TMPL
# else
# define BOOST_NO_CXX11_VARIADIC_TEMPLATES