download.lst | 4 - external/boost/0001-Add-a-comma-before-ellipsis-in-constexpr_swap.patch.2 | 28 ++++++++++ external/boost/UnpackedTarball_boost.mk | 2 3 files changed, 32 insertions(+), 2 deletions(-)
New commits: commit 4f60246a1de68f7b47713ff926902791abe7a9ca Author: Michael Weghorn <[email protected]> AuthorDate: Tue Dec 17 23:17:24 2024 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Dec 18 09:27:08 2024 +0100 Revert "boost: upgrade to 1_87_0" for now to unbreak android arm32 build For some (still unknown) reason the upgrade from boost 1.86 to 1.87 caused the 32-bit ARM Android builds to fail with errors like <inline asm>:1:41: error: expected '%<type>' or "<type>" .pushsection ".debug_gdb_scripts", "MS",@progbits,1 ^ <inline asm>:318:12: error: .popsection without corresponding .pushsection .popsection ^ 2 errors generated. make[1]: *** [/home/tdf/lode/jenkins/workspace/android_arm/solenv/gbuild/LinkTarget.mk:339: /home/tdf/lode/jenkins/workspace/android_arm/workdir/CxxObject/configmgr/source/groupnode.o] Error 1 make[1]: *** Waiting for unfinished jobs.... [build CXX] configmgr/source/node.cxx <inline asm>:1:41: error: expected '%<type>' or "<type>" .pushsection ".debug_gdb_scripts", "MS",@progbits,1 ^ , see e.g. [1] and the list of all Android ARM 32 bit builds [2]. A local bisect points to this commit, and reverting it fixes the build. Do this for now to work around the build failure and give time for finding a better solution. This reverts commit 25e7e1677b13db818b5458cd0c3fd3d9dfc88557. [1] https://ci.libreoffice.org/job/gerrit_android_arm/43354/console [2] https://ci.libreoffice.org/job/gerrit_android_arm/ Change-Id: Ifad1412b691adce74bb16805975e3439898e3b74 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178697 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/download.lst b/download.lst index 28dd281b80ed..d3a472317160 100644 --- a/download.lst +++ b/download.lst @@ -14,8 +14,8 @@ ARGON2_TARBALL := phc-winner-argon2-20190702.tar.gz # so that git cherry-pick # will not run into conflicts # please repack the tarball using external/boost/repack_tarball.sh -BOOST_SHA256SUM := 750cbad72488ffbd6000f77d4fc40246e96141da556ee99000c1dc8664ea1157 -BOOST_TARBALL := boost_1_87_0.tar.xz +BOOST_SHA256SUM := efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c +BOOST_TARBALL := boost_1_86_0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/boost/0001-Add-a-comma-before-ellipsis-in-constexpr_swap.patch.2 b/external/boost/0001-Add-a-comma-before-ellipsis-in-constexpr_swap.patch.2 new file mode 100644 index 000000000000..3c3c8755fbfa --- /dev/null +++ b/external/boost/0001-Add-a-comma-before-ellipsis-in-constexpr_swap.patch.2 @@ -0,0 +1,28 @@ +From 2dfe66886d71b9a341433ea8b6ff225cc07da80b Mon Sep 17 00:00:00 2001 +From: Andrey Semashev <[email protected]> +Date: Mon, 2 Dec 2024 19:22:20 +0300 +Subject: Add a comma before ellipsis in constexpr_swap. + +gcc 15 complains that the comma is required before vararg ellipsis. + +Fixes https://github.com/boostorg/integer/issues/35. +--- + include/boost/integer/common_factor_rt.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/boost/integer/common_factor_rt.hpp b/include/boost/integer/common_factor_rt.hpp +index d6765d4..817682f 100644 +--- a/include/boost/integer/common_factor_rt.hpp ++++ b/include/boost/integer/common_factor_rt.hpp +@@ -64,7 +64,7 @@ namespace boost { + return a.swap(b); + } + template <class T, class U> +- inline constexpr void constexpr_swap(T&a, U& b...) BOOST_GCD_NOEXCEPT(T) ++ inline constexpr void constexpr_swap(T& a, U& b, ...) BOOST_GCD_NOEXCEPT(T) + { + T t(static_cast<T&&>(a)); + a = static_cast<T&&>(b); +-- +2.47.1 + diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index 0cd3c78e7bd3..3a8033bbea1e 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -36,6 +36,8 @@ boost_patches += Wundef.patch.0 boost_patches += boost.spirit.noreturn.patch +boost_patches += 0001-Add-a-comma-before-ellipsis-in-constexpr_swap.patch.2 + # Sent upstream as <https://github.com/boostorg/move/pull/58> "Avoid # -Wdeprecated-variadic-comma-omission with GCC 15 trunk -std=c++26": boost_patches += 0001-Avoid-Wdeprecated-variadic-comma-omission-with-GCC-1.patch.2
