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 +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 +- 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(a)); + a = static_cast(b); +-- +2.47.1 + diff --git a/external/boost/0001-Avoid-Wdeprecated-variadic-comma-omission-with-GCC-1.patch.2 b/external/boost/0001-Avoid-Wdeprecated-variadic-comma-omission-with-GCC-1.patch.2 new file mode 100644 index 000000000000..e7ebc6e18b62 --- /dev/null +++ b/external/boost/0001-Avoid-Wdeprecated-variadic-comma-omission-with-GCC-1.patch.2 @@ -0,0 +1,38 @@ +From aa25af1928cc275537276c1a50e6ba49333a3aec Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Mon, 2 Dec 2024 19:06:25 +0100 +Subject: Avoid -Wdeprecated-variadic-comma-omission with GCC 15 trunk + -std=c++26 + +...since + +"c++: Implement C++26 P3176R1 - The Oxford variadic comma" +--- + include/boost/move/detail/unique_ptr_meta_utils.hpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/boost/move/detail/unique_ptr_meta_utils.hpp b/include/boost/move/detail/unique_ptr_meta_utils.hpp +index 4c6aeb5..27154e0 100644 +--- a/include/boost/move/detail/unique_ptr_meta_utils.hpp ++++ b/include/boost/move/detail/unique_ptr_meta_utils.hpp +@@ -497,7 +497,7 @@ struct is_unary_function_impl + { static const bool value = true; }; + + template +-struct is_unary_function_impl ++struct is_unary_function_impl + { static const bool value = true; }; + + #else // BOOST_MOVE_TT_TEST_MSC_FUNC_SIGS +@@ -519,7 +519,7 @@ struct is_unary_function_impl + { static const bool value = true; }; + + template +-struct is_unary_function_impl ++struct is_unary_function_impl + { static const bool value = true; }; + + #endif +-- +2.47.1 + diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index 23b9a3c23dc8..3a8033bbea1e 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -36,6 +36,12 @@ 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 "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 + $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL)))