openRuyi-tutorials/buildroot
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/gnuradio: fix build with fmt >= 11.x

Browse Source 
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 <ju.o@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Julien Olivain
2024-08-10 22:05:28 +02:00
committed by Thomas Petazzoni
parent 904acfc41e
commit 81e6541efe
1 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
package/gnuradio/0001-blocks-runtime-io_signature-include-spdlog-ranges.h-.patch Normal file
View File

@@ -0,0 +1,38 @@
From 03c9a40883e610e54b8fc3c3ce1842d68d7ce2e4 Mon Sep 17 00:00:00 2001
From: Kefu Chai <tchaikov@gmail.com>
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 <tchaikov@gmail.com>
(cherry picked from commit 19b070051c1c2b5fb6f2da8fb6422b27418c3dfa)
Signed-off-by: Jeff Long <willcode4@gmail.com>
Upstream: https://github.com/gnuradio/gnuradio/commit/ead459813367e7fd679dad067d1b020010d49b4f
[Julien: backported commit ead45981 from v3.10.11.0]
Signed-off-by: Julien Olivain <ju.o@free.fr>
---
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 <pmt/pmt.h>
#include <spdlog/common.h>
#include <spdlog/fmt/fmt.h>
+#if __has_include(<spdlog/fmt/ranges.h>)
+#include <spdlog/fmt/ranges.h>
+#elif __has_include(<spdlog/fmt/bundled/ranges.h>)
+#include <spdlog/fmt/bundled/ranges.h>
+#endif
#include <functional>
#include <utility>
#include <vector>
--
2.46.0