diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2022-02-25 08:45:17 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-02-25 13:28:27 +0100 |
| commit | 48119cf42acef33dedcbba92d3bfb8cf8c9938d1 (patch) | |
| tree | e174bbb81f933e13cb03ef5801f401a43212c93a /external | |
| parent | 9d432faade9281b1211577f9e9a2d65d46ecbdb1 (diff) | |
Upgrade external/boost to latest Boost 1.78.0
<https://dev-www.libreoffice.org/src/boost_1_78_0.tar.xz> has been generated (on
Fedora 35) with
> $ wget https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.bz2
> --2022-02-24 12:05:39-- https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.bz2
> $ printf '8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc boost_1_78_0.tar.bz2' | sha256sum -c # cf. <https://www.boost.org/users/history/version_1_78_0.html>
> boost_1_78_0.tar.bz2: OK
> $ external/boost/repack_tarball.sh boost_1_78_0.tar.bz2
> Unpacking boost_1_78_0.tar.bz2 ...
> Removing unnecessary files ...
> Creating boost_1_78_0.tar.xz ...
> Cleaning up ...
> 0df00d3699c2c7c7fd490c5e165a3e72641861ea5d26428de2f008fb9a75659f boost_1_78_0.tar.xz
> Done.
external/boost/boost_1_60_0.undef.warning.patch was obsoleted by
<https://github.com/boostorg/config/commit/9e80993844cb3d69bfdfa10f059706d7f22eb324>
"Define __clang_major___WORKAROUND_GUARD"
Change-Id: I7e59ef01ace4ff3c28a285e978e63279b119b07d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130514
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/boost/UnpackedTarball_boost.mk | 1 | ||||
| -rw-r--r-- | external/boost/boost_1_60_0.undef.warning.patch | 16 |
2 files changed, 0 insertions, 17 deletions
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index 9e6a12bc4116..96bf85583673 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -28,7 +28,6 @@ boost_patches += boost_1_59_0.property_tree.wreturn-type.patch boost_patches += clang-cl.patch.0 -boost_patches += boost_1_60_0.undef.warning.patch boost_patches += boost_1_63_0.undef.warning.patch.1 boost_patches += windows-no-utf8-locales.patch.0 diff --git a/external/boost/boost_1_60_0.undef.warning.patch b/external/boost/boost_1_60_0.undef.warning.patch deleted file mode 100644 index 1e72d4e17a90..000000000000 --- a/external/boost/boost_1_60_0.undef.warning.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/b/boost/boost/config/workaround.hpp -+++ a/b/boost/boost/config/workaround.hpp -@@ -237,6 +237,13 @@ - #else - #define BOOST_INTEL_WORKAROUND_GUARD 0 - #endif -+ -+#ifndef __clang_major__ -+#define __clang_major___WORKAROUND_GUARD 1 -+#else -+#define __clang_major___WORKAROUND_GUARD 0 -+#endif -+ - // Always define to zero, if it's used it'll be defined my MPL: - #define BOOST_MPL_CFG_GCC_WORKAROUND_GUARD 0 - |