commit:     f4529a6b34c49b6be0b832702edb1e68a5596eef
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 18 21:46:25 2026 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 19 00:16:05 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4529a6b

dev-libs/botan: Fix build w/ boost-1.89

Closes: https://bugs.gentoo.org/964322
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/botan/botan-2.19.5.ebuild                 |  3 +-
 dev-libs/botan/files/botan-2.19.5-boost-1.89.patch | 42 ++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/dev-libs/botan/botan-2.19.5.ebuild 
b/dev-libs/botan/botan-2.19.5.ebuild
index 0548cf3f82e4..bfec98c6cf61 100644
--- a/dev-libs/botan/botan-2.19.5.ebuild
+++ b/dev-libs/botan/botan-2.19.5.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
@@ -58,6 +58,7 @@ PATCHES=(
        "${FILESDIR}"/${P}-boost-1.87.patch
        "${FILESDIR}"/${P}-cloudflare.patch
        "${FILESDIR}"/${P}-include.patch
+       "${FILESDIR}"/${P}-boost-1.89.patch # bug 964322
 )
 
 python_check_deps() {

diff --git a/dev-libs/botan/files/botan-2.19.5-boost-1.89.patch 
b/dev-libs/botan/files/botan-2.19.5-boost-1.89.patch
new file mode 100644
index 000000000000..57c4e17cd0c9
--- /dev/null
+++ b/dev-libs/botan/files/botan-2.19.5-boost-1.89.patch
@@ -0,0 +1,42 @@
+From 7ba456b8eef5e7f43047ebe856357c0fa7629491 Mon Sep 17 00:00:00 2001
+From: Rene Meusel <[email protected]>
+Date: Tue, 19 Jul 2022 15:08:04 +0200
+Subject: [PATCH] stop linking against legacy boost-system library
+
+From Boost 1.69 (released end 2018) libboost_system was just an empty
+stub added for backward compatibility reasons. The actual code is
+header-only since then.
+
+This removes the explicit linkage of libboost_system, effectively
+making Botan incompatible with Boost < 1.69.
+
+asturm 2026-01-18: Reduced to the bits we really need.
+---
+ configure.py                 | 31 +------------------------------
+ doc/building.rst             |  8 --------
+ src/lib/utils/boost/info.txt |  7 ++++++-
+ src/scripts/ci_build.py      | 16 +++++++---------
+ 4 files changed, 14 insertions(+), 48 deletions(-)
+
+diff --git a/configure.py b/configure.py
+index beed9bbc6ff..7a38ae89977 100755
+--- a/configure.py
++++ b/configure.py
+@@ -509,8 +509,6 @@ def process_command_line(args): # pylint: 
disable=too-many-locals,too-many-state
+                            help=optparse.SUPPRESS_HELP)
+     build_group.add_option('--without-pkg-config', dest='with_pkg_config', 
action='store_false',
+                            help=optparse.SUPPRESS_HELP)
+-    build_group.add_option('--boost-library-name', dest='boost_libnames', 
default=[],
+-                           help="file name of some boost library to link", 
action='append')
+ 
+     docs_group = optparse.OptionGroup(parser, 'Documentation Options')
+ 
+@@ -1926,7 +1897,7 @@ def link_to(module_member_name):
+                         if osinfo.basename not in exceptions:
+                             libs |= set(module_link_to)
+ 
+-        return sorted([adjust_library_name(lib) for lib in libs])
++        return sorted(libs)
+ 
+     def choose_mp_bits():
+         mp_bits = arch.wordsize # allow command line override?

Reply via email to