This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch AOO41Xjammy
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit ab4c2950fa1f6a1ab2122bfcaa3214bb8d99cddc
Author: Arrigo Marchiori <ard...@yahoo.it>
AuthorDate: Tue Feb 2 18:24:43 2021 +0100
change c++ include paths on gcc >= 7 (#109)
(cherry picked from commit a475517f1dd745a5797c2c645f7cd75945c2bb6a)
---
main/boost/boost_1_55_0.patch | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/main/boost/boost_1_55_0.patch b/main/boost/boost_1_55_0.patch
index df9b8ec8e0..b2042a01c7 100644
--- a/main/boost/boost_1_55_0.patch
+++ b/main/boost/boost_1_55_0.patch
@@ -359,3 +359,17 @@ diff -ur misc/boost_1_55_0/boost/config/compiler/gcc.hpp
misc/build/boost_1_55_0
# define BOOST_HAS_VARIADIC_TMPL
# else
# define BOOST_NO_CXX11_VARIADIC_TEMPLATES
+--- misc/boost_1_55_0/boost/tr1/detail/config_all.hpp 2020-11-21
14:07:48.895886290 +0100
++++ misc/build/boost_1_55_0/boost/tr1/detail/config_all.hpp 2020-11-21
14:10:16.895419939 +0100
+@@ -95,6 +95,11 @@
+ // compiler version:
+ # define BOOST_TR1_STD_HEADER(name) <../4.0.0/name>
+ /*
++ * After version 6 the include path consists of the major number
only
++ */
++# elif (__GNUC__ > 6)
++# define BOOST_TR1_STD_HEADER(name) <../__GNUC__/name>
++ /*
+ * Before version 3.4.0 the 0 patch level was not part of the
include path:
+ */
+ # elif defined (__GNUC_PATCHLEVEL__) && ((__GNUC_PATCHLEVEL__ > 0) || \
