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@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@gentoo.org>
This commit is contained in:
ChaseKnowlden
2025-10-12 12:34:41 +01:00
committed by Sam James
parent a3b4fa5223
commit 077bcb27a4
4 changed files with 105 additions and 0 deletions
@@ -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>
@@ -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>
+1
View File
@@ -57,6 +57,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-2.2.0-openssl-version.patch
"${FILESDIR}"/${P}-boost-1.89.patch
)
python_check_deps() {
+4
View File
@@ -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}]" \