summaryrefslogtreecommitdiffstats
path: root/external/boost
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2021-11-10 08:11:30 +0100
committerStephan Bergmann <sbergman@redhat.com>2021-11-10 13:33:48 +0100
commit13e0b122f100a17fa54757e40dd8b334559522a6 (patch)
treea724ee659aa38f4a1fc63503e8d3c67402c6661c /external/boost
parentUpdate git submodules (diff)
downloadcore-13e0b122f100a17fa54757e40dd8b334559522a6.tar.gz
core-13e0b122f100a17fa54757e40dd8b334559522a6.zip
Upgrade external/boost to latest Boost 1.77.0
<https://dev-www.libreoffice.org/src/boost_1_77_0.tar.xz> has been generated (on Fedora 35) with > $ wget https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.bz2 > $ printf 'fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854 boost_1_77_0.tar.bz2' | sha256sum -c # cf. <https://www.boost.org/users/history/version_1_77_0.html> > boost_1_77_0.tar.bz2: OK > $ external/boost/repack_tarball.sh boost_1_77_0.tar.bz2 > Unpacking boost_1_77_0.tar.bz2 ... > Removing unnecessary files ... > Creating boost_1_77_0.tar.xz ... > Cleaning up ... > 9b334d6c6d7af5a0687280788cd84444398b8e0b472cd88e52bbc3c3ef11d98e boost_1_77_0.tar.xz > Done. Change-Id: I527cad7eb2f311d968da371f268644bdd31f6462 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124947 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/boost')
-rw-r--r--external/boost/0001-Fix-include-inside-boost-namespace.patch.233
-rw-r--r--external/boost/StaticLibrary_boost_filesystem.mk5
-rw-r--r--external/boost/UnpackedTarball_boost.mk3
3 files changed, 5 insertions, 36 deletions
diff --git a/external/boost/0001-Fix-include-inside-boost-namespace.patch.2 b/external/boost/0001-Fix-include-inside-boost-namespace.patch.2
deleted file mode 100644
index ce123dbb4453..000000000000
--- a/external/boost/0001-Fix-include-inside-boost-namespace.patch.2
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1ec5c98d80de97f9e962c5627e1a0e6096099894 Mon Sep 17 00:00:00 2001
-From: Daniel Scharrer <daniel@constexpr.org>
-Date: Wed, 28 Jul 2021 19:56:31 +0200
-Subject: [PATCH] Fix #include inside boost namespace
-
-The existing code fails to build if <utility> was not already included.
----
- include/boost/math/tools/mp.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/boost/math/tools/mp.hpp b/include/boost/math/tools/mp.hpp
-index 35565646f..dc8440988 100644
---- a/include/boost/math/tools/mp.hpp
-+++ b/include/boost/math/tools/mp.hpp
-@@ -13,6 +13,7 @@
-
- #include <type_traits>
- #include <cstddef>
-+#include <utility>
-
- namespace boost { namespace math { namespace tools { namespace meta_programming {
-
-@@ -338,7 +339,6 @@ using mp_remove_if_q = mp_remove_if<L, Q::template fn>;
- // Index sequence
- // Use C++14 index sequence if available
- #if defined(__cpp_lib_integer_sequence) && (__cpp_lib_integer_sequence >= 201304)
--#include <utility>
- template<std::size_t... I>
- using index_sequence = std::index_sequence<I...>;
-
---
-2.31.1
-
diff --git a/external/boost/StaticLibrary_boost_filesystem.mk b/external/boost/StaticLibrary_boost_filesystem.mk
index 483e0a79b6ca..23b42d75029b 100644
--- a/external/boost/StaticLibrary_boost_filesystem.mk
+++ b/external/boost/StaticLibrary_boost_filesystem.mk
@@ -18,6 +18,11 @@ $(eval $(call gb_StaticLibrary_add_defs,boost_filesystem,\
-DBOOST_ALL_NO_LIB \
))
+# See workdir/UnpackedTarball/boost/libs/filesystem/build/Jamfile.v2:
+ifeq ($(HAVE_CXX20_ATOMIC_REF),)
+$(eval $(call gb_StaticLibrary_add_defs,boost_filesystem,-DBOOST_FILESYSTEM_NO_CXX20_ATOMIC_REF))
+endif
+
$(eval $(call gb_StaticLibrary_use_external,boost_filesystem,boost_headers))
$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boost_filesystem,cpp))
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk
index 5a4607b77bec..838c495c5161 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -35,9 +35,6 @@ boost_patches += windows-no-utf8-locales.patch.0
boost_patches += msvc2017.patch.0
-# From upstream develop branch:
-boost_patches += 0001-Fix-include-inside-boost-namespace.patch.2
-
$(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
$(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL)))