commit: 193fc4967badab19eb56916dfc8d725dd89754b2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jan 15 22:06:10 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jan 17 21:23:30 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=193fc496
dev-build/boost-m4: Fix for header-only boost-system since 1.70 Bug: https://bugs.gentoo.org/963550 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...019.ebuild => boost-m4-0.4_p20221019-r1.ebuild} | 4 +++- dev-build/boost-m4/boost-m4-0.4_p20221019.ebuild | 4 ++-- ...4_p20221019-boost-1.70-system-header-only.patch | 26 ++++++++++++++++++++++ 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dev-build/boost-m4/boost-m4-0.4_p20221019.ebuild b/dev-build/boost-m4/boost-m4-0.4_p20221019-r1.ebuild similarity index 89% copy from dev-build/boost-m4/boost-m4-0.4_p20221019.ebuild copy to dev-build/boost-m4/boost-m4-0.4_p20221019-r1.ebuild index da81e72f6269..96ca5a5db262 100644 --- a/dev-build/boost-m4/boost-m4-0.4_p20221019.ebuild +++ b/dev-build/boost-m4/boost-m4-0.4_p20221019-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,6 +14,8 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos" +PATCHES=( "${FILESDIR}/${P}-boost-1.70-system-header-only.patch" ) + # boost.m4 has a buildsystem, but the distributer didn't use make dist # so we'd have to eautoreconf to use it. Also, its ./configure script # DEPENDs on boost. For installing one file, bootstrapping the diff --git a/dev-build/boost-m4/boost-m4-0.4_p20221019.ebuild b/dev-build/boost-m4/boost-m4-0.4_p20221019.ebuild index da81e72f6269..590891eb8b13 100644 --- a/dev-build/boost-m4/boost-m4-0.4_p20221019.ebuild +++ b/dev-build/boost-m4/boost-m4-0.4_p20221019.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ S="${WORKDIR}"/${PN/-/.}-${BOOST_COMMIT} LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" # boost.m4 has a buildsystem, but the distributer didn't use make dist # so we'd have to eautoreconf to use it. Also, its ./configure script diff --git a/dev-build/boost-m4/files/boost-m4-0.4_p20221019-boost-1.70-system-header-only.patch b/dev-build/boost-m4/files/boost-m4-0.4_p20221019-boost-1.70-system-header-only.patch new file mode 100644 index 000000000000..54fb7fc61075 --- /dev/null +++ b/dev-build/boost-m4/files/boost-m4-0.4_p20221019-boost-1.70-system-header-only.patch @@ -0,0 +1,26 @@ +Combination of: +https://github.com/tsuna/boost.m4/commit/8d9ceb2dc54587aa1cace4bc0932a804b0538d36 +https://github.com/tsuna/boost.m4/commit/c88f9d1d27707d85ba39fbaeedddddd505e76e6c + +diff -u a/build-aux/boost.m4 b/build-aux/boost.m4 +--- a/build-aux/boost.m4 ++++ b/build-aux/boost.m4 +@@ -1332,11 +1332,16 @@ + # -------------------------------- + # Look for Boost.System. For the documentation of PREFERRED-RT-OPT, see the + # documentation of BOOST_FIND_LIB above. This library was introduced in Boost +-# 1.35.0. ++# 1.35.0 and is header only since 1.70. + BOOST_DEFUN([System], +-[BOOST_FIND_LIB([system], [$1], ++[ ++if test $boost_major_version -ge 170; then ++ BOOST_FIND_HEADER([boost/system/error_code.hpp]) ++else ++ BOOST_FIND_LIB([system], [$1], + [boost/system/error_code.hpp], + [boost::system::error_code e; e.clear();], [], [], [$2]) ++fi + ])# BOOST_SYSTEM + +
