summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex@linutronix.de>2025-01-08 09:42:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-01-10 11:10:00 +0000
commitc65340f13eebf8a42782b3443f0c79cc96552e9e (patch)
treed204d41f221b4c659a35c191b7fc29becfaed663
parentce2ef75087440493fb890d1aa9498d7f6207b244 (diff)
downloadpoky-c65340f13eebf8a42782b3443f0c79cc96552e9e.tar.gz
boost: update 1.86.0 -> 1.87.0
Backport a kea patch to address 1.87.0 compatibility. (From OE-Core rev: ac328183d4592ad146c41e48c2c92d1dbb53a894) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/kea/files/0001-Update-asiolink-for-boost-1.87.patch190
-rw-r--r--meta/recipes-connectivity/kea/kea_2.6.1.bb1
-rw-r--r--meta/recipes-support/boost/boost-1.87.0.inc (renamed from meta/recipes-support/boost/boost-1.86.0.inc)2
-rw-r--r--meta/recipes-support/boost/boost-build-native_1.87.0.bb (renamed from meta/recipes-support/boost/boost-build-native_1.86.0.bb)0
-rw-r--r--meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch2
-rw-r--r--meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch2
-rw-r--r--meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch8
-rw-r--r--meta/recipes-support/boost/boost_1.87.0.bb (renamed from meta/recipes-support/boost/boost_1.86.0.bb)0
8 files changed, 198 insertions, 7 deletions
diff --git a/meta/recipes-connectivity/kea/files/0001-Update-asiolink-for-boost-1.87.patch b/meta/recipes-connectivity/kea/files/0001-Update-asiolink-for-boost-1.87.patch
new file mode 100644
index 0000000000..794726f1f1
--- /dev/null
+++ b/meta/recipes-connectivity/kea/files/0001-Update-asiolink-for-boost-1.87.patch
@@ -0,0 +1,190 @@
1From dab0f3daafb760ace0d4091f74ff90edb225ca02 Mon Sep 17 00:00:00 2001
2From: q66 <q66@chimera-linux.org>
3Date: Sun, 15 Dec 2024 03:04:53 +0100
4Subject: [PATCH] Update asiolink for boost 1.87
5
6Upstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/merge_requests/2523]
7Signed-off-by: Alexander Kanavin <alex@linutronix.de>
8---
9 src/lib/asiolink/io_address.cc | 4 ++--
10 src/lib/asiolink/io_service.cc | 8 ++++----
11 src/lib/asiolink/tcp_endpoint.h | 2 +-
12 src/lib/asiolink/udp_endpoint.h | 2 +-
13 src/lib/asiolink/unix_domain_socket.cc | 16 ++++++++--------
14 src/lib/dhcp/iface_mgr.cc | 2 +-
15 6 files changed, 17 insertions(+), 17 deletions(-)
16
17diff --git a/src/lib/asiolink/io_address.cc b/src/lib/asiolink/io_address.cc
18index 43459bf..06b7d3d 100644
19--- a/src/lib/asiolink/io_address.cc
20+++ b/src/lib/asiolink/io_address.cc
21@@ -37,7 +37,7 @@ IOAddress::Hash::operator()(const IOAddress &io_address) const {
22 // because we'd like to throw our own exception on failure.
23 IOAddress::IOAddress(const std::string& address_str) {
24 boost::system::error_code err;
25- asio_address_ = ip::address::from_string(address_str, err);
26+ asio_address_ = ip::make_address(address_str, err);
27 if (err) {
28 isc_throw(IOError, "Failed to convert string to address '"
29 << address_str << "': " << err.message());
30@@ -116,7 +116,7 @@ IOAddress::isV6Multicast() const {
31 uint32_t
32 IOAddress::toUint32() const {
33 if (asio_address_.is_v4()) {
34- return (asio_address_.to_v4().to_ulong());
35+ return (asio_address_.to_v4().to_uint());
36 } else {
37 isc_throw(BadValue, "Can't convert " << toText()
38 << " address to IPv4.");
39diff --git a/src/lib/asiolink/io_service.cc b/src/lib/asiolink/io_service.cc
40index 411de64..cc28d24 100644
41--- a/src/lib/asiolink/io_service.cc
42+++ b/src/lib/asiolink/io_service.cc
43@@ -30,7 +30,7 @@ public:
44 /// @brief The constructor.
45 IOServiceImpl() :
46 io_service_(),
47- work_(new boost::asio::io_service::work(io_service_)) {
48+ work_(boost::asio::make_work_guard(io_service_)) {
49 };
50
51 /// @brief The destructor.
52@@ -92,7 +92,7 @@ public:
53
54 /// @brief Restarts the IOService in preparation for a subsequent @ref run() invocation.
55 void restart() {
56- io_service_.reset();
57+ io_service_.restart();
58 }
59
60 /// @brief Removes IO service work object to let it finish running
61@@ -115,12 +115,12 @@ public:
62 ///
63 /// @param callback The callback to be run on the IO service.
64 void post(const std::function<void ()>& callback) {
65- io_service_.post(callback);
66+ boost::asio::post(io_service_, callback);
67 }
68
69 private:
70 boost::asio::io_service io_service_;
71- boost::shared_ptr<boost::asio::io_service::work> work_;
72+ boost::asio::executor_work_guard<boost::asio::io_service::executor_type> work_;
73 };
74
75 IOService::IOService() : io_impl_(new IOServiceImpl()) {
76diff --git a/src/lib/asiolink/tcp_endpoint.h b/src/lib/asiolink/tcp_endpoint.h
77index 8ebd575..7c8cb35 100644
78--- a/src/lib/asiolink/tcp_endpoint.h
79+++ b/src/lib/asiolink/tcp_endpoint.h
80@@ -42,7 +42,7 @@ public:
81 /// \param port The TCP port number of the endpoint.
82 TCPEndpoint(const IOAddress& address, const unsigned short port) :
83 asio_endpoint_placeholder_(
84- new boost::asio::ip::tcp::endpoint(boost::asio::ip::address::from_string(address.toText()),
85+ new boost::asio::ip::tcp::endpoint(boost::asio::ip::make_address(address.toText()),
86 port)),
87 asio_endpoint_(*asio_endpoint_placeholder_)
88 {}
89diff --git a/src/lib/asiolink/udp_endpoint.h b/src/lib/asiolink/udp_endpoint.h
90index f960bf3..2a3da9f 100644
91--- a/src/lib/asiolink/udp_endpoint.h
92+++ b/src/lib/asiolink/udp_endpoint.h
93@@ -42,7 +42,7 @@ public:
94 /// \param port The UDP port number of the endpoint.
95 UDPEndpoint(const IOAddress& address, const unsigned short port) :
96 asio_endpoint_placeholder_(
97- new boost::asio::ip::udp::endpoint(boost::asio::ip::address::from_string(address.toText()),
98+ new boost::asio::ip::udp::endpoint(boost::asio::ip::make_address(address.toText()),
99 port)),
100 asio_endpoint_(*asio_endpoint_placeholder_)
101 {}
102diff --git a/src/lib/asiolink/unix_domain_socket.cc b/src/lib/asiolink/unix_domain_socket.cc
103index f43e1c9..43ff3c8 100644
104--- a/src/lib/asiolink/unix_domain_socket.cc
105+++ b/src/lib/asiolink/unix_domain_socket.cc
106@@ -83,7 +83,7 @@ public:
107 /// @param buffer Buffers holding the data to be sent.
108 /// @param handler User supplied callback to be invoked when data have
109 /// been sent or sending error is signalled.
110- void doSend(const boost::asio::const_buffers_1& buffer,
111+ void doSend(const boost::asio::const_buffer& buffer,
112 const UnixDomainSocket::Handler& handler);
113
114
115@@ -103,7 +103,7 @@ public:
116 /// @param ec Error code returned as a result of sending the data.
117 /// @param length Length of the data sent.
118 void sendHandler(const UnixDomainSocket::Handler& remote_handler,
119- const boost::asio::const_buffers_1& buffer,
120+ const boost::asio::const_buffer& buffer,
121 const boost::system::error_code& ec,
122 size_t length);
123
124@@ -127,7 +127,7 @@ public:
125 /// @param buffer A buffer into which the data should be received.
126 /// @param handler User supplied callback invoked when data have been
127 /// received on an error is signalled.
128- void doReceive(const boost::asio::mutable_buffers_1& buffer,
129+ void doReceive(const boost::asio::mutable_buffer& buffer,
130 const UnixDomainSocket::Handler& handler);
131
132 /// @brief Local handler invoked as a result of asynchronous receive.
133@@ -146,7 +146,7 @@ public:
134 /// @param ec Error code returned as a result of asynchronous receive.
135 /// @param length Size of the received data.
136 void receiveHandler(const UnixDomainSocket::Handler& remote_handler,
137- const boost::asio::mutable_buffers_1& buffer,
138+ const boost::asio::mutable_buffer& buffer,
139 const boost::system::error_code& ec,
140 size_t length);
141
142@@ -197,7 +197,7 @@ UnixDomainSocketImpl::asyncSend(const void* data, const size_t length,
143 }
144
145 void
146-UnixDomainSocketImpl::doSend(const boost::asio::const_buffers_1& buffer,
147+UnixDomainSocketImpl::doSend(const boost::asio::const_buffer& buffer,
148 const UnixDomainSocket::Handler& handler) {
149 auto local_handler = std::bind(&UnixDomainSocketImpl::sendHandler,
150 shared_from_this(),
151@@ -207,7 +207,7 @@ UnixDomainSocketImpl::doSend(const boost::asio::const_buffers_1& buffer,
152
153 void
154 UnixDomainSocketImpl::sendHandler(const UnixDomainSocket::Handler& remote_handler,
155- const boost::asio::const_buffers_1& buffer,
156+ const boost::asio::const_buffer& buffer,
157 const boost::system::error_code& ec,
158 size_t length) {
159 // The asynchronous send may return EWOULDBLOCK or EAGAIN on some
160@@ -230,7 +230,7 @@ UnixDomainSocketImpl::asyncReceive(void* data, const size_t length,
161 }
162
163 void
164-UnixDomainSocketImpl::doReceive(const boost::asio::mutable_buffers_1& buffer,
165+UnixDomainSocketImpl::doReceive(const boost::asio::mutable_buffer& buffer,
166 const UnixDomainSocket::Handler& handler) {
167 auto local_handler = std::bind(&UnixDomainSocketImpl::receiveHandler,
168 shared_from_this(),
169@@ -240,7 +240,7 @@ UnixDomainSocketImpl::doReceive(const boost::asio::mutable_buffers_1& buffer,
170
171 void
172 UnixDomainSocketImpl::receiveHandler(const UnixDomainSocket::Handler& remote_handler,
173- const boost::asio::mutable_buffers_1& buffer,
174+ const boost::asio::mutable_buffer& buffer,
175 const boost::system::error_code& ec,
176 size_t length) {
177 // The asynchronous receive may return EWOULDBLOCK or EAGAIN on some
178diff --git a/src/lib/dhcp/iface_mgr.cc b/src/lib/dhcp/iface_mgr.cc
179index 01a1d63..419268b 100644
180--- a/src/lib/dhcp/iface_mgr.cc
181+++ b/src/lib/dhcp/iface_mgr.cc
182@@ -1034,7 +1034,7 @@ IfaceMgr::getLocalAddress(const IOAddress& remote_addr, const uint16_t port) {
183 }
184
185 // Create socket that will be used to connect to remote endpoint.
186- boost::asio::io_service io_service;
187+ boost::asio::io_context io_service;
188 boost::asio::ip::udp::socket sock(io_service);
189
190 boost::system::error_code err_code;
diff --git a/meta/recipes-connectivity/kea/kea_2.6.1.bb b/meta/recipes-connectivity/kea/kea_2.6.1.bb
index 4f8c4124cb..19e07f5da3 100644
--- a/meta/recipes-connectivity/kea/kea_2.6.1.bb
+++ b/meta/recipes-connectivity/kea/kea_2.6.1.bb
@@ -19,6 +19,7 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \
19 file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ 19 file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \
20 file://0001-Replace-Name-NameString-with-vector-of-uint8_t.patch \ 20 file://0001-Replace-Name-NameString-with-vector-of-uint8_t.patch \
21 file://0002-Fix-unittests-Typo-in-Name-Name-append-to-ndata_-not.patch \ 21 file://0002-Fix-unittests-Typo-in-Name-Name-append-to-ndata_-not.patch \
22 file://0001-Update-asiolink-for-boost-1.87.patch \
22 " 23 "
23SRC_URI[sha256sum] = "d2ce14a91c2e248ad2876e29152d647bcc5e433bc68dafad0ee96ec166fcfad1" 24SRC_URI[sha256sum] = "d2ce14a91c2e248ad2876e29152d647bcc5e433bc68dafad0ee96ec166fcfad1"
24 25
diff --git a/meta/recipes-support/boost/boost-1.86.0.inc b/meta/recipes-support/boost/boost-1.87.0.inc
index 7113a50049..c6e55b239e 100644
--- a/meta/recipes-support/boost/boost-1.86.0.inc
+++ b/meta/recipes-support/boost/boost-1.87.0.inc
@@ -12,7 +12,7 @@ BOOST_MAJ = "${@"_".join(d.getVar("PV").split(".")[0:2])}"
12BOOST_P = "boost_${BOOST_VER}" 12BOOST_P = "boost_${BOOST_VER}"
13 13
14SRC_URI = "https://archives.boost.io/release/${PV}/source/${BOOST_P}.tar.bz2" 14SRC_URI = "https://archives.boost.io/release/${PV}/source/${BOOST_P}.tar.bz2"
15SRC_URI[sha256sum] = "1bed88e40401b2cb7a1f76d4bab499e352fa4d0c5f31c0dbae64e24d34d7513b" 15SRC_URI[sha256sum] = "af57be25cb4c4f4b413ed692fe378affb4352ea50fbe294a11ef548f4d527d89"
16 16
17UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/" 17UPSTREAM_CHECK_URI = "http://www.boost.org/users/download/"
18UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/" 18UPSTREAM_CHECK_REGEX = "release/(?P<pver>.*)/source/"
diff --git a/meta/recipes-support/boost/boost-build-native_1.86.0.bb b/meta/recipes-support/boost/boost-build-native_1.87.0.bb
index 764f410780..764f410780 100644
--- a/meta/recipes-support/boost/boost-build-native_1.86.0.bb
+++ b/meta/recipes-support/boost/boost-build-native_1.87.0.bb
diff --git a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
index 78f652f619..04bede4578 100644
--- a/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
+++ b/meta/recipes-support/boost/boost/0001-Don-t-set-up-arch-instruction-set-flags-we-do-that-o.patch
@@ -1,4 +1,4 @@
1From f88354966fe3af33fd6d9ec889a8e3926b886a8a Mon Sep 17 00:00:00 2001 1From e2cc24d6d8b7b24a6d0a30c52c7ad69a001a0ad5 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 18 Dec 2018 15:42:57 +0100 3Date: Tue, 18 Dec 2018 15:42:57 +0100
4Subject: [PATCH] Don't set up arch/instruction-set flags, we do that 4Subject: [PATCH] Don't set up arch/instruction-set flags, we do that
diff --git a/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch b/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch
index 8f130348b0..db1ee03898 100644
--- a/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch
+++ b/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch
@@ -1,4 +1,4 @@
1From 7130850d74863d1e9a0ae3e85462f1466bdf6d88 Mon Sep 17 00:00:00 2001 1From b0728812241c048907e6f1ba168292cd9948347d Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com> 2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Thu, 14 Nov 2019 10:13:53 +0800 3Date: Thu, 14 Nov 2019 10:13:53 +0800
4Subject: [PATCH] dont setup compiler flags -m32/-m64 4Subject: [PATCH] dont setup compiler flags -m32/-m64
diff --git a/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch b/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch
index dde21fa076..ad90d96ddd 100644
--- a/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch
+++ b/meta/recipes-support/boost/boost/boost-math-disable-pch-for-gcc.patch
@@ -1,4 +1,4 @@
1From c6009cdc1fe76db0092443593396e4d5f0eaa86b Mon Sep 17 00:00:00 2001 1From e7491f9874411fd9855957812ba9bac948a61356 Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com> 2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Fri, 23 Sep 2016 01:04:50 -0700 3Date: Fri, 23 Sep 2016 01:04:50 -0700
4Subject: [PATCH] boost-math: disable pch for gcc 4Subject: [PATCH] boost-math: disable pch for gcc
@@ -14,11 +14,11 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/libs/math/build/Jamfile.v2 b/libs/math/build/Jamfile.v2 16diff --git a/libs/math/build/Jamfile.v2 b/libs/math/build/Jamfile.v2
17index 6549e06b7..342cbf0b1 100644 17index 500c77363..504d7d8c6 100644
18--- a/libs/math/build/Jamfile.v2 18--- a/libs/math/build/Jamfile.v2
19+++ b/libs/math/build/Jamfile.v2 19+++ b/libs/math/build/Jamfile.v2
20@@ -13,7 +13,7 @@ project 20@@ -15,7 +15,7 @@ project
21 <toolset>intel-win:<linkflags>-nologo 21 <toolset>intel-win:<linkflags>-nologo
22 #<toolset>intel-linux:<pch>off 22 #<toolset>intel-linux:<pch>off
23 <toolset>intel-darwin:<pch>off 23 <toolset>intel-darwin:<pch>off
24- <toolset>gcc,<target-os>windows:<pch>off 24- <toolset>gcc,<target-os>windows:<pch>off
diff --git a/meta/recipes-support/boost/boost_1.86.0.bb b/meta/recipes-support/boost/boost_1.87.0.bb
index 4b580d078b..4b580d078b 100644
--- a/meta/recipes-support/boost/boost_1.86.0.bb
+++ b/meta/recipes-support/boost/boost_1.87.0.bb