You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2023/01/20 18:36:42 UTC
[openoffice] branch trunk updated: With our "-std=gnu++98", building with Clang and internal Boost breaks in several places, because Clang doesn't expose the tuple type but Boost expects it.
This is an automated email from the ASF dual-hosted git repository.
damjan 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 8ef8ad0624 With our "-std=gnu++98", building with Clang and internal Boost breaks in several places, because Clang doesn't expose the tuple type but Boost expects it.
8ef8ad0624 is described below
commit 8ef8ad062493ab86aa92fbefc05347f372e8d25c
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri Jan 20 20:33:01 2023 +0200
With our "-std=gnu++98", building with Clang and internal Boost breaks in
several places, because Clang doesn't expose the tuple type but Boost
expects it.
Define BOOST_NO_CXX11_HDR_TUPLE when using Clang and internal Boost so
that Boost uses its own tuple type.
Patch by: me
---
main/boost/boost-clang.patch | 9 +++++++++
main/boost/makefile.mk | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/main/boost/boost-clang.patch b/main/boost/boost-clang.patch
new file mode 100644
index 0000000000..1582a9e73f
--- /dev/null
+++ b/main/boost/boost-clang.patch
@@ -0,0 +1,9 @@
+--- misc/build/boost_1_55_0/boost/config/user.hpp 2023-01-20 06:52:20.006784000 +0200
++++ misc/build/boost_1_55_0/boost/config/user.hpp 2023-01-20 06:54:54.816087000 +0200
+@@ -122,3 +122,6 @@
+
+
+
++#if defined(__clang__)
++#define BOOST_NO_CXX11_HDR_TUPLE
++#endif
diff --git a/main/boost/makefile.mk b/main/boost/makefile.mk
index ae402c982a..c6cd36e498 100644
--- a/main/boost/makefile.mk
+++ b/main/boost/makefile.mk
@@ -46,7 +46,7 @@ all:
TARFILE_NAME=boost_1_55_0
TARFILE_MD5=d6eef4b4cacb2183f2bf265a5a03a354
-PATCH_FILES= $(TARFILE_NAME).patch
+PATCH_FILES= $(TARFILE_NAME).patch boost-clang.patch
.IF "$(GUI)"=="OS2"
PATCH_FILES+=boost-os2.patch
.ENDIF