commit: 077bcb27a4e60cfc1ce8ec721399705bed8d2d80 Author: ChaseKnowlden <haroldknowlden <AT> gmail <DOT> com> AuthorDate: Fri Oct 10 02:05:25 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Oct 12 11:34:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=077bcb27
net-misc/kea: fix build with Boost 1.89 Closes: https://bugs.gentoo.org/963975 Closes: https://bugs.gentoo.org/963749 Signed-off-by: ChaseKnowlden <haroldknowlden <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44120 Closes: https://github.com/gentoo/gentoo/pull/44120 Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/kea/files/kea-2.6.4-boost-1.89.patch | 50 +++++++++++++++++++++++++++ net-misc/kea/files/kea-3.0.1-boost-1.89.patch | 50 +++++++++++++++++++++++++++ net-misc/kea/kea-2.6.4.ebuild | 1 + net-misc/kea/kea-3.0.1.ebuild | 4 +++ 4 files changed, 105 insertions(+) diff --git a/net-misc/kea/files/kea-2.6.4-boost-1.89.patch b/net-misc/kea/files/kea-2.6.4-boost-1.89.patch new file mode 100644 index 000000000000..6675e04f2adf --- /dev/null +++ b/net-misc/kea/files/kea-2.6.4-boost-1.89.patch @@ -0,0 +1,50 @@ +Fixes the build with Boost 1.89 +diff --git a/m4macros/ax_boost_for_kea.m4 b/m4macros/ax_boost_for_kea.m4 +index 996413374a..7d616eb03e 100644 +--- a/m4macros/ax_boost_for_kea.m4 ++++ b/m4macros/ax_boost_for_kea.m4 +@@ -205,7 +205,7 @@ AC_ARG_ENABLE([boost-headers-only], + as it may result in non-optimized code on some + platforms or introduce runtime errors on others.])], + [enable_boost_header="yes"; BOOST_LIBS=""], +- [BOOST_LIBS="${BOOST_LIBS} -lboost_system"]) ++ [BOOST_LIBS="${BOOST_LIBS}"]) + + # BOOST_ERROR_CODE_HEADER_ONLY in versions below Boost 1.56.0 can fail + # to find the error_code.cpp file. +diff --git a/src/lib/asiodns/io_fetch.cc b/src/lib/asiodns/io_fetch.cc +index 742abc66e9..d87e4abdcc 100644 +--- a/src/lib/asiodns/io_fetch.cc ++++ b/src/lib/asiodns/io_fetch.cc +@@ -24,6 +24,7 @@ + + #include <boost/scoped_ptr.hpp> + #include <boost/date_time/posix_time/posix_time_types.hpp> ++#include <boost/asio/deadline_timer.hpp> + + #include <functional> + #include <unistd.h> // for some IPC/network system calls +diff --git a/src/lib/asiodns/tests/io_fetch_unittest.cc b/src/lib/asiodns/tests/io_fetch_unittest.cc +index e93e796ae9..c968b45c02 100644 +--- a/src/lib/asiodns/tests/io_fetch_unittest.cc ++++ b/src/lib/asiodns/tests/io_fetch_unittest.cc +@@ -21,6 +21,7 @@ + + #include <gtest/gtest.h> + #include <boost/date_time/posix_time/posix_time_types.hpp> ++#include <boost/asio/deadline_timer.hpp> + + #include <algorithm> + #include <cstdlib> +diff --git a/src/lib/asiolink/interval_timer.cc b/src/lib/asiolink/interval_timer.cc +index fa0d9e1b67..4ac0b20c7d 100644 +--- a/src/lib/asiolink/interval_timer.cc ++++ b/src/lib/asiolink/interval_timer.cc +@@ -12,6 +12,7 @@ + #include <boost/enable_shared_from_this.hpp> + #include <boost/noncopyable.hpp> + #include <boost/shared_ptr.hpp> ++#include <boost/asio/deadline_timer.hpp> + + #include <exceptions/exceptions.h> + diff --git a/net-misc/kea/files/kea-3.0.1-boost-1.89.patch b/net-misc/kea/files/kea-3.0.1-boost-1.89.patch new file mode 100644 index 000000000000..146762274029 --- /dev/null +++ b/net-misc/kea/files/kea-3.0.1-boost-1.89.patch @@ -0,0 +1,50 @@ +Fixes the build with Boost 1.89 +diff --git a/meson.build b/meson.build +index ab2fa78212..8592196856 100644 +--- a/meson.build ++++ b/meson.build +@@ -189,7 +189,7 @@ message(f'Detected system "@SYSTEM@".') + + #### Dependencies + +-boost_dep = dependency('boost', version: '>=1.66', modules: ['system']) ++boost_dep = dependency('boost', version: '>=1.66') + dl_dep = dependency('dl') + threads_dep = dependency('threads') + add_project_dependencies(boost_dep, dl_dep, threads_dep, language: ['cpp']) +diff --git a/src/lib/asiodns/io_fetch.cc b/src/lib/asiodns/io_fetch.cc +index c140676f66..ee2575a884 100644 +--- a/src/lib/asiodns/io_fetch.cc ++++ b/src/lib/asiodns/io_fetch.cc +@@ -24,6 +24,7 @@ + + #include <boost/scoped_ptr.hpp> + #include <boost/date_time/posix_time/posix_time_types.hpp> ++#include <boost/asio/deadline_timer.hpp> + + #include <functional> + #include <unistd.h> // for some IPC/network system calls +diff --git a/src/lib/asiodns/tests/io_fetch_unittest.cc b/src/lib/asiodns/tests/io_fetch_unittest.cc +index 7b4cd0568e..3d04230f02 100644 +--- a/src/lib/asiodns/tests/io_fetch_unittest.cc ++++ b/src/lib/asiodns/tests/io_fetch_unittest.cc +@@ -21,6 +21,7 @@ + + #include <gtest/gtest.h> + #include <boost/date_time/posix_time/posix_time_types.hpp> ++#include <boost/asio/deadline_timer.hpp> + + #include <algorithm> + #include <cstdlib> +diff --git a/src/lib/asiolink/interval_timer.cc b/src/lib/asiolink/interval_timer.cc +index fa0d9e1b67..4ac0b20c7d 100644 +--- a/src/lib/asiolink/interval_timer.cc ++++ b/src/lib/asiolink/interval_timer.cc +@@ -12,6 +12,7 @@ + #include <boost/enable_shared_from_this.hpp> + #include <boost/noncopyable.hpp> + #include <boost/shared_ptr.hpp> ++#include <boost/asio/deadline_timer.hpp> + + #include <exceptions/exceptions.h> + diff --git a/net-misc/kea/kea-2.6.4.ebuild b/net-misc/kea/kea-2.6.4.ebuild index 8bdd2dac0b0b..69d773abd762 100644 --- a/net-misc/kea/kea-2.6.4.ebuild +++ b/net-misc/kea/kea-2.6.4.ebuild @@ -57,6 +57,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-2.2.0-openssl-version.patch + "${FILESDIR}"/${P}-boost-1.89.patch ) python_check_deps() { diff --git a/net-misc/kea/kea-3.0.1.ebuild b/net-misc/kea/kea-3.0.1.ebuild index cd42501a703e..8aa33c4f8a08 100644 --- a/net-misc/kea/kea-3.0.1.ebuild +++ b/net-misc/kea/kea-3.0.1.ebuild @@ -61,6 +61,10 @@ BDEPEND=" ${PYTHON_DEPS} " +PATCHES=( + "${FILESDIR}"/${P}-boost-1.89.patch +) + python_check_deps() { use doc || return 0; python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" \
