package/gnuradio: revert patch 003 suppression
PATCH 1/1 package/gnuradio: revert patch 003 suppression
From: Gwenhael Goavec-Merou <[email protected]>
Patch 0003-gr-digital-glfsr.h-drop-boost-cstdint.hpp-and-use-cs.patch is applied in gnuradio master branch but has not been backported to maint-3.8. So this patch can't be supressed.
Fix:
- http://autobuild.buildroot.net/results/79a7dabc20016bcf11afe22e6a5691edbba2455b/
- http://autobuild.buildroot.net/results/7342833ebcc8f399d98ba05e63fce6b60403371e/
- http://autobuild.buildroot.net/results/1807c1b054623148f0a2e55dd998b0b428f48b47/
--- ....h-drop-boost-cstdint.hpp-and-use-cs.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/gnuradio/0003-gr-digital-glfsr.h-drop-boost-cstdint.hpp-and-use-cs.patch
package/gnuradio/0003-gr-digital-glfsr.h-drop-boost-cstdint.hpp-and-use-cs.patch new file +39 -0
@@ -0,0 +1,39 @@ +From f643bc12100c67288adda3699a9e61d6a66fb529 Mon Sep 17 00:00:00 2001 +From: Gwenhael Goavec-Merou <[email protected]> +Date: Fri, 7 Feb 2020 16:49:30 +0100 +Subject: [PATCH] gr-digital:glfsr.h: drop boost/cstdint.hpp and use cstdint + +gr-digital/glfsr.h include boost/cstdint.hpp to have uintxx_t. +These types are in boost namespace but nor using namespace xxx, nor boost:: are used. +The result is : +In file included from /home/buildroot/autobuild/instance-0/output-1/build/gnuradio-3.8.0.0/gr-digital/lib/glfsr.cc:23: +/home/buildroot/autobuild/instance-0/output-1/build/gnuradio-3.8.0.0/gr-digital/lib/../include/gnuradio/digital/glfsr.h:42:5: error: 'uint32_t' does not name a type; did you mean 'u_int32_t'? +uint32_t d_shift_register; +^~~~~~~~ +u_int32_t + +Since Gnuradio policy is Less boost == better and C++11 is used, use cstdint +instead of boost/cstdint.hpp. + +[backported from 475e4a156b516c089175afb998acdc80b740b437] +Signed-off-by: Gwenhael Goavec-Merou <[email protected]> +--- + gr-digital/include/gnuradio/digital/glfsr.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gr-digital/include/gnuradio/digital/glfsr.h b/gr-digital/include/gnuradio/digital/glfsr.h +index 0b5141f1f..1003bcd01 100644 +--- a/gr-digital/include/gnuradio/digital/glfsr.h ++++ b/gr-digital/include/gnuradio/digital/glfsr.h +@@ -24,7 +24,7 @@ + #define INCLUDED_DIGITAL_GLFSR_H + + #include <gnuradio/digital/api.h> +-#include <boost/cstdint.hpp> ++#include <cstdint> + + namespace gr { + namespace digital { +-- +2.24.1 +
Signature · 1 line
2.24.1
PATCH 1/1 package/gnuradio: revert patch 003 suppression
Quoted 5 lines · On Tue, 14 Apr 2020 10:51:54 +0200 Gwenhael Goavec-Merou…
From: Gwenhael Goavec-Merou <[email protected]>
Patch 0003-gr-digital-glfsr.h-drop-boost-cstdint.hpp-and-use-cs.patch is applied in gnuradio master branch but has not been backported to maint-3.8. So this patch can't be supressed.
It's good to point to which specific commit introduced the issue, so I reworded this to:
In commit 14476b7fcaf102dcc39b5d4919a4f08660f821de ("package/gnuradio:
bump to 3.8.1.0"), all gnuradio patches were dropped. However, it turns out that the path 0003-gr-digital-glfsr.h-drop-boost-cstdint.hpp-and-use-cs.patch was applied in gnuradio master branch but has not been backported to maint-3.8. So this patch can't be supressed as we are using gnuradio 3.8.1.0.
package/gnuradio/0003-gr-digital-glfsr.h-drop-boost-cstdint.hpp-and-use-cs.patch
Quoted 1 line
package/gnuradio/0003-gr-digital-glfsr.h-drop-boost-cstdint.hpp-and-use-cs.patch +0
-0
0003... but it's now the only patch on gnuradio, so I renamed it to 0001.
Applied with this fixed. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com