From 81e6541efe054df635947d0c143818f8cf7cb048 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 10 Aug 2024 22:05:28 +0200 Subject: [PATCH] package/gnuradio: fix build with fmt >= 11.x gnuradio is failing to build since commit 6b86f076c3 "package/fmt: bump to version 11.0.1" with output: /build/gnuradio-3.10.7.0/gr-blocks/lib/message_debug_impl.cc: In member function 'void gr::blocks::message_debug_impl::log(const pmt::pmt_t&)': /build/gnuradio-3.10.7.0/gr-blocks/lib/message_debug_impl.cc:65:44: error: 'join' is not a member of 'fmt' 65 | fmt::join(begin, begin + output_length, " "), | ^~~~ This commit adds a backported upstream patch to fix the issue. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7540345284 http://autobuild.buildroot.org/results/4c92949ef74a119d9a70e4fdd55af05a66580b0c/ Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- ...o_signature-include-spdlog-ranges.h-.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/gnuradio/0001-blocks-runtime-io_signature-include-spdlog-ranges.h-.patch diff --git a/package/gnuradio/0001-blocks-runtime-io_signature-include-spdlog-ranges.h-.patch b/package/gnuradio/0001-blocks-runtime-io_signature-include-spdlog-ranges.h-.patch new file mode 100644 index 0000000000..6a08b8edee --- /dev/null +++ b/package/gnuradio/0001-blocks-runtime-io_signature-include-spdlog-ranges.h-.patch @@ -0,0 +1,38 @@ +From 03c9a40883e610e54b8fc3c3ce1842d68d7ce2e4 Mon Sep 17 00:00:00 2001 +From: Kefu Chai +Date: Mon, 15 Jul 2024 09:27:16 +0800 +Subject: [PATCH] blocks,runtime: io_signature: include spdlog/*/ranges.h for + using fmt::join() + +fmt::join() was moved into fmt/ranges.h since fmt 11, so let's +include the corresponding header in spdlog for using it. + +Signed-off-by: Kefu Chai +(cherry picked from commit 19b070051c1c2b5fb6f2da8fb6422b27418c3dfa) +Signed-off-by: Jeff Long +Upstream: https://github.com/gnuradio/gnuradio/commit/ead459813367e7fd679dad067d1b020010d49b4f +[Julien: backported commit ead45981 from v3.10.11.0] +Signed-off-by: Julien Olivain +--- + gr-blocks/lib/message_debug_impl.cc | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/gr-blocks/lib/message_debug_impl.cc b/gr-blocks/lib/message_debug_impl.cc +index 1e81aec0d..415d2be97 100644 +--- a/gr-blocks/lib/message_debug_impl.cc ++++ b/gr-blocks/lib/message_debug_impl.cc +@@ -14,6 +14,11 @@ + #include + #include + #include ++#if __has_include() ++#include ++#elif __has_include() ++#include ++#endif + #include + #include + #include +-- +2.46.0 +