From f634043b29c7009cca02516e181d55bb589045c4 Mon Sep 17 00:00:00 2001 From: Thomas Perale Date: Mon, 30 Sep 2024 22:21:25 +0200 Subject: [PATCH] package/gnuradio: fix build by removing unneeded package patch The gnuradio package patch 0001 was introduced in commit 81e6541ef "package/gnuradio: fix build with fmt >= 11.x" [1] while Buildroot was in a release client stabilization branch. It was first in included in the 2024.08-rc2 tag. This is why the gnuradio version was _not_ bumped at that time. At the same time, the gnuradio package was also broken in the "next" branch for the same reason. It was fixed by bumping the gnuradio version in commit 101e7b69d "package/gnuradio: bump version to 3.10.11.0" [2] which contained the 0001 patch. Both commits [1] and [2] are individually working. The gnuradio package fails to build since the merge commit 3daa03752 "Merge branch 'next'" [3]. This commit fixes the issue by removing the package patch. Fixes: - http://autobuild.buildroot.org/results/dfda705bb1b3b975bde3d84c6b25a9b41c545c84 - http://autobuild.buildroot.org/results/7c32bd40b5e1420535734480bf5a4d4365b8896f - https://gitlab.com/buildroot.org/buildroot/-/jobs/7888800399 [1] https://gitlab.com/buildroot.org/buildroot/-/commit/81e6541efe054df635947d0c143818f8cf7cb048 [2] https://gitlab.com/buildroot.org/buildroot/-/commit/101e7b69da88148fa8333af05444e47bae631833 [3] https://gitlab.com/buildroot.org/buildroot/-/commit/3daa037528c38b91caf616cb47992da7730f4343 Signed-off-by: Thomas Perale Reviewed-by: Julien Olivain Signed-off-by: Julien Olivain --- ...o_signature-include-spdlog-ranges.h-.patch | 38 ------------------- 1 file changed, 38 deletions(-) delete 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 deleted file mode 100644 index 6a08b8edee..0000000000 --- a/package/gnuradio/0001-blocks-runtime-io_signature-include-spdlog-ranges.h-.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 -