diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-08-10 07:44:53 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2021-08-10 09:15:00 +0200 |
| commit | 1f6851c6f6d6fee67c56dd4e6e6013ba000eaf84 (patch) | |
| tree | e36d3917314f1884bbf97e67900cf072d0e1bd22 /solenv | |
| parent | 29e5fad7ed64459d04df61b57ecd8eaba6d8bfae (diff) | |
Upgrade external/boost to latest Boost 1.76.0
* <https://dev-www.libreoffice.org/src/boost_1_76_0.tar.xz> has been generated
(on Fedora 34) with
> $ wget https://boostorg.jfrog.io/native/main/release/1.76.0/source/boost_1_76_0.tar.bz2
> $ printf 'f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41 boost_1_76_0.tar.bz2' | sha256sum -c # cf. <https://www.boost.org/users/history/version_1_76_0.html>
> boost_1_76_0.tar.bz2: OK
> $ external/boost/repack_tarball.sh boost_1_76_0.tar.bz2
> Unpacking boost_1_76_0.tar.bz2 ...
> Removing unnecessary files ...
> Creating boost_1_76_0.tar.xz ...
> Cleaning up ...
> adfa0ca971c56006a8304b6146d1382e6369815d568f6e6a7440fe29995d51b8 boost_1_76_0.tar.xz
> Done.
* external/boost/0001-Fix-include-inside-boost-namespace.patch.2 is necessary
to fix
> checking for boost/math/constants/constants.hpp... no
> configure: error: Required boost headers not found.
> make[1]: *** [external/libzmf/ExternalProject_libzmf.mk:28: workdir/ExternalProject/libzmf/build] Error 1
with recent libstdc++ 12 trunk (presumably since
<https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=261d5a4a459bd49942e53bc83334ccc7154a09d5>
"libstdc++: Reduce header dependencies on <array> and <utility>", and with other
standard libraries <utility> was likely already included indirectly earlier, so
the include nested in namespace boost::math::tools::meta_programming in the
middle of workdir/UnpackedTarball/boost/boost/math/tools/mp.hpp didn't cause
harm).
Change-Id: I1eee23915fea48bbb383cbeefc4ddfdeaac63e14
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120253
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/flatpak-manifest.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 077adb03cbc5..922c7c5d42fb 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -173,11 +173,11 @@ "dest-filename": "EmojiOneColor-SVGinOT-1.3.tar.gz" }, { - "url": "https://dev-www.libreoffice.org/src/boost_1_75_0.tar.xz", - "sha256": "cc378a036a1cfd3af289f3da24deeb8dba7a729f61ab104c7b018a622e22d21b", + "url": "https://dev-www.libreoffice.org/src/boost_1_76_0.tar.xz", + "sha256": "adfa0ca971c56006a8304b6146d1382e6369815d568f6e6a7440fe29995d51b8", "type": "file", "dest": "external/tarballs", - "dest-filename": "boost_1_75_0.tar.xz" + "dest-filename": "boost_1_76_0.tar.xz" }, { "url": "https://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz", |