mirror of
https://github.com/openwrt/packages.git
synced 2026-05-31 06:51:51 +08:00
Alexandru Ardelean
0170e780b0
Snapshot builds for i386_pentium-mmx (and presumably every other
target now that Boost 1.91 has been bumped in the feed) fail with::
src/lib/dns/rdataclass.cc:1401:5: error: 'BOOST_STATIC_ASSERT'
was not declared in this scope; did you mean
'BOOST_HAS_STATIC_ASSERT'?
1401 | BOOST_STATIC_ASSERT(sizeof(numdata_) ==
``BOOST_STATIC_ASSERT`` lives in ``<boost/static_assert.hpp>``. In
earlier Boost releases it was reachable through any number of
transitive includes pulled in by Kea's other DNS headers; in 1.91
those transitive paths have been pruned, so call sites must include
the declaring header explicitly. ``050-boost-static-assert.patch``
already does this for ``src/lib/log/logger_level_impl.cc``;
``src/lib/dns/rdataclass.cc`` uses the same macro at SOA::getMinimum()
to size-check ``numdata_`` and was missed.
Extend the existing patch with the matching include in rdataclass.cc.
Same fix shape as the earlier hunk; no behavioural change.
Build log:
https://downloads.openwrt.org/snapshots/faillogs/i386_pentium-mmx/packages/kea/
Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>
21 lines
489 B
Diff
21 lines
489 B
Diff
--- a/src/lib/log/logger_level_impl.cc
|
|
+++ b/src/lib/log/logger_level_impl.cc
|
|
@@ -10,6 +10,7 @@
|
|
#include <string.h>
|
|
#include <iostream>
|
|
#include <boost/lexical_cast.hpp>
|
|
+#include <boost/static_assert.hpp>
|
|
|
|
#include <log4cplus/logger.h>
|
|
|
|
--- a/src/lib/dns/rdataclass.cc
|
|
+++ b/src/lib/dns/rdataclass.cc
|
|
@@ -24,6 +24,7 @@
|
|
#include <dns/txt_like.h>
|
|
#include <util/buffer.h>
|
|
#include <util/encode/encode.h>
|
|
+#include <boost/static_assert.hpp>
|
|
|
|
#include <cerrno>
|
|
#include <cstring>
|