* [Buildroot] [PATCH 1/2] package/gnuradio: bump to 3.10.5.1
@ 2023-02-23 20:15 Martin Böh via buildroot
2023-02-23 20:15 ` [Buildroot] [PATCH 2/2] package/gnuradio: remove pybind target suffix when crosscompiling Martin Böh via buildroot
2023-07-31 22:20 ` [Buildroot] [PATCH 1/2] package/gnuradio: bump to 3.10.5.1 Thomas Petazzoni via buildroot
0 siblings, 2 replies; 5+ messages in thread
From: Martin Böh via buildroot @ 2023-02-23 20:15 UTC (permalink / raw)
To: buildroot; +Cc: Martin Böh, Gwenhael Goavec-Merou
Signed-off-by: Martin Böh <contact@martb.dev>
---
...g-missing-vector-in-blockinterleaver.patch | 42 -------------------
...rleaving.h-add-missing-cstddef-heade.patch | 33 ---------------
package/gnuradio/gnuradio.hash | 2 +-
package/gnuradio/gnuradio.mk | 2 +-
4 files changed, 2 insertions(+), 77 deletions(-)
delete mode 100644 package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch
delete mode 100644 package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch
diff --git a/package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch b/package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch
deleted file mode 100644
index 39b8c0b51e..0000000000
--- a/package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 45fe4ac55ad88b6793d225e676205c30388ec138 Mon Sep 17 00:00:00 2001
-From: Ryan Volz <ryan.volz@gmail.com>
-Date: Fri, 16 Sep 2022 21:05:51 -0400
-Subject: [PATCH] blocks: Including missing <vector> in blockinterleaver.
-
-Signed-off-by: Ryan Volz <ryan.volz@gmail.com>
-[Retrieved (and backported) from:
-https://github.com/gnuradio/gnuradio/commit/463c3477549b26b32d9b73eef30044e97c4eee64]
-Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
----
- gr-blocks/include/gnuradio/blocks/blockinterleaving.h | 2 +-
- gr-blocks/lib/blockinterleaving.cc | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
-index 9d4e0f249..df831fe5a 100644
---- a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
-+++ b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
-@@ -12,7 +12,7 @@
- #define INCLUDED_GR_BLOCKS_BLOCKINTERLEAVING_H
-
- #include <gnuradio/blocks/api.h>
--
-+#include <vector>
-
- namespace gr {
- namespace blocks {
-diff --git a/gr-blocks/lib/blockinterleaving.cc b/gr-blocks/lib/blockinterleaving.cc
-index fc5873e11..768ad9ea7 100644
---- a/gr-blocks/lib/blockinterleaving.cc
-+++ b/gr-blocks/lib/blockinterleaving.cc
-@@ -12,6 +12,7 @@
- #include <spdlog/fmt/fmt.h>
- #include <algorithm>
- #include <numeric>
-+#include <vector>
-
- namespace gr {
- namespace blocks {
---
-2.35.1
-
diff --git a/package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch b/package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch
deleted file mode 100644
index f1ad77580f..0000000000
--- a/package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 901c2ad1ac88908a2e6db5615d5af39a218d826d Mon Sep 17 00:00:00 2001
-From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
-Date: Fri, 23 Sep 2022 08:41:26 +0200
-Subject: [PATCH] blocks/blockinterleaving.h: add missing cstddef header
- (required for size_t)
-
-Fix build failure like:
-
-gnuradio/gr-blocks/lib/../include/gnuradio/blocks/blockinterleaving.h:25:36: error: ‘size_t’ was not declared in this scope
-
-This failure is due to the miss of cstddef include
-
-Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
-[Upstream status: https://github.com/gnuradio/gnuradio/pull/6188]
----
- gr-blocks/include/gnuradio/blocks/blockinterleaving.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
-index df831fe5a..33c59e35b 100644
---- a/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
-+++ b/gr-blocks/include/gnuradio/blocks/blockinterleaving.h
-@@ -13,6 +13,7 @@
-
- #include <gnuradio/blocks/api.h>
- #include <vector>
-+#include <cstddef>
-
- namespace gr {
- namespace blocks {
---
-2.35.1
-
diff --git a/package/gnuradio/gnuradio.hash b/package/gnuradio/gnuradio.hash
index efa0bb462b..44bb6562df 100644
--- a/package/gnuradio/gnuradio.hash
+++ b/package/gnuradio/gnuradio.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 c6b9f59447a842559b00b3a67b4ca1186e9adb8db742b25400507fedc747f2bd gnuradio-3.10.4.0.tar.gz
+sha256 85d90147f7f28450bff75eeefd2b44adc88b231d29fe8e86cc3a65437dba6d9f gnuradio-3.10.5.1.tar.gz
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk
index cc41f1e12b..8004ef0554 100644
--- a/package/gnuradio/gnuradio.mk
+++ b/package/gnuradio/gnuradio.mk
@@ -4,7 +4,7 @@
#
################################################################################
-GNURADIO_VERSION = 3.10.4.0
+GNURADIO_VERSION = 3.10.5.1
GNURADIO_SITE = $(call github,gnuradio,gnuradio,v$(GNURADIO_VERSION))
GNURADIO_LICENSE = GPL-3.0+
GNURADIO_LICENSE_FILES = COPYING
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Buildroot] [PATCH 2/2] package/gnuradio: remove pybind target suffix when crosscompiling
2023-02-23 20:15 [Buildroot] [PATCH 1/2] package/gnuradio: bump to 3.10.5.1 Martin Böh via buildroot
@ 2023-02-23 20:15 ` Martin Böh via buildroot
2023-02-23 22:12 ` Thomas Petazzoni via buildroot
2023-07-31 22:20 ` [Buildroot] [PATCH 1/2] package/gnuradio: bump to 3.10.5.1 Thomas Petazzoni via buildroot
1 sibling, 1 reply; 5+ messages in thread
From: Martin Böh via buildroot @ 2023-02-23 20:15 UTC (permalink / raw)
To: buildroot; +Cc: Martin Böh, Gwenhael Goavec-Merou
This is required as pybind11 uses host python3 and therefore the host platform suffixes.
Without this change gnuradio and all plugins relying on its GrPybind macros, use the wrong suffixes.
This leads to module load failures when crosscompiling.
See:
- https://github.com/gnuradio/gnuradio/issues/5455
- https://github.com/pybind/pybind11/issues/3640
Signed-off-by: Martin Böh <contact@martb.dev>
---
...nd-remove-suffix-when-crosscompiling.patch | 56 +++++++++++++++++++
1 file changed, 56 insertions(+)
create mode 100644 package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch
diff --git a/package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch b/package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch
new file mode 100644
index 0000000000..0ac4395e58
--- /dev/null
+++ b/package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch
@@ -0,0 +1,56 @@
+From c58760b002c1a954a9ab628352900fcd8e6e199c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20B=C3=B6h?= <contact@martb.dev>
+Date: Wed, 22 Feb 2023 03:05:08 +0100
+Subject: [PATCH] grPyBind: fix invalid suffix
+
+This is required as pybind11 uses host python3 and therefore the host platform suffixes.
+---
+ cmake/Modules/GrPybind.cmake | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/cmake/Modules/GrPybind.cmake b/cmake/Modules/GrPybind.cmake
+index 5a6fb7633..c2df17c2d 100644
+--- a/cmake/Modules/GrPybind.cmake
++++ b/cmake/Modules/GrPybind.cmake
+@@ -8,6 +8,12 @@ macro(GR_PYBIND_MAKE name updir filter files)
+ ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
+
+ pybind11_add_module(${name}_python ${files})
++
++ # Use normal .so suffix when crosscompiling
++ # See https://github.com/gnuradio/gnuradio/issues/5455
++ if (CMAKE_CROSSCOMPILING)
++ set_target_properties(${name}_python PROPERTIES SUFFIX ".so")
++ endif()
+
+ set(MODULE_NAME ${name})
+ if(${name} STREQUAL gr)
+@@ -135,6 +141,12 @@ macro(GR_PYBIND_MAKE_CHECK_HASH name updir filter files)
+
+ pybind11_add_module(${name}_python ${files})
+
++ # Use normal .so suffix when crosscompiling
++ # See https://github.com/gnuradio/gnuradio/issues/5455
++ if (CMAKE_CROSSCOMPILING)
++ set_target_properties(${name}_python PROPERTIES SUFFIX ".so")
++ endif()
++
+ set(MODULE_NAME ${name})
+ if(${name} STREQUAL gr)
+ set(MODULE_NAME "runtime")
+@@ -286,6 +298,12 @@ macro(GR_PYBIND_MAKE_OOT name updir filter files)
+
+ pybind11_add_module(${name}_python ${files})
+
++ # Use normal .so suffix when crosscompiling
++ # See https://github.com/gnuradio/gnuradio/issues/5455
++ if (CMAKE_CROSSCOMPILING)
++ set_target_properties(${name}_python PROPERTIES SUFFIX ".so")
++ endif()
++
+ set(MODULE_NAME ${name})
+ if(${name} STREQUAL gr)
+ set(MODULE_NAME "runtime")
+--
+2.39.1
+
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Buildroot] [PATCH 2/2] package/gnuradio: remove pybind target suffix when crosscompiling
2023-02-23 20:15 ` [Buildroot] [PATCH 2/2] package/gnuradio: remove pybind target suffix when crosscompiling Martin Böh via buildroot
@ 2023-02-23 22:12 ` Thomas Petazzoni via buildroot
2023-07-31 22:21 ` Thomas Petazzoni via buildroot
0 siblings, 1 reply; 5+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-02-23 22:12 UTC (permalink / raw)
To: Martin Böh via buildroot; +Cc: Gwenhael Goavec-Merou, Martin Böh
Hello Martin,
Thanks for your patch. Some comment/question below.
On Thu, 23 Feb 2023 21:15:11 +0100
Martin Böh via buildroot <buildroot@buildroot.org> wrote:
> This is required as pybind11 uses host python3 and therefore the host platform suffixes.
> Without this change gnuradio and all plugins relying on its GrPybind macros, use the wrong suffixes.
> This leads to module load failures when crosscompiling.
>
> See:
> - https://github.com/gnuradio/gnuradio/issues/5455
> - https://github.com/pybind/pybind11/issues/3640
>
> Signed-off-by: Martin Böh <contact@martb.dev>
> ---
> ...nd-remove-suffix-when-crosscompiling.patch | 56 +++++++++++++++++++
> 1 file changed, 56 insertions(+)
> create mode 100644 package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch
>
> diff --git a/package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch b/package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch
> new file mode 100644
> index 0000000000..0ac4395e58
> --- /dev/null
> +++ b/package/gnuradio/0001-grPyBind-remove-suffix-when-crosscompiling.patch
> @@ -0,0 +1,56 @@
> +From c58760b002c1a954a9ab628352900fcd8e6e199c Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Martin=20B=C3=B6h?= <contact@martb.dev>
> +Date: Wed, 22 Feb 2023 03:05:08 +0100
> +Subject: [PATCH] grPyBind: fix invalid suffix
> +
> +This is required as pybind11 uses host python3 and therefore the host platform suffixes.
We need your Signed-off-by here, and also the upstream status of this
patch.
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 2/2] package/gnuradio: remove pybind target suffix when crosscompiling
2023-02-23 22:12 ` Thomas Petazzoni via buildroot
@ 2023-07-31 22:21 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-07-31 22:21 UTC (permalink / raw)
To: Thomas Petazzoni via buildroot
Cc: Martin Böh, Gwenhael Goavec-Merou, Thomas Petazzoni
Hello Martin,
On Thu, 23 Feb 2023 23:12:58 +0100
Thomas Petazzoni via buildroot <buildroot@buildroot.org> wrote:
> > +This is required as pybind11 uses host python3 and therefore the host platform suffixes.
>
> We need your Signed-off-by here, and also the upstream status of this
> patch.
Unless I missed it, I don't think you followed-up on this. In the mean
time, this issue has been fixed (I believe) in a different way in
commit
https://gitlab.com/buildroot.org/buildroot/-/commit/e22b450692a6d02da43a453f24ec057bb5517422.
Could you verify that the latest Buildroot master works for you?
Thanks for your contribution!
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/gnuradio: bump to 3.10.5.1
2023-02-23 20:15 [Buildroot] [PATCH 1/2] package/gnuradio: bump to 3.10.5.1 Martin Böh via buildroot
2023-02-23 20:15 ` [Buildroot] [PATCH 2/2] package/gnuradio: remove pybind target suffix when crosscompiling Martin Böh via buildroot
@ 2023-07-31 22:20 ` Thomas Petazzoni via buildroot
1 sibling, 0 replies; 5+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-07-31 22:20 UTC (permalink / raw)
To: Martin Böh via buildroot; +Cc: Gwenhael Goavec-Merou, Martin Böh
Hello Martin,
On Thu, 23 Feb 2023 21:15:10 +0100
Martin Böh via buildroot <buildroot@buildroot.org> wrote:
> Signed-off-by: Martin Böh <contact@martb.dev>
> ---
> ...g-missing-vector-in-blockinterleaver.patch | 42 -------------------
> ...rleaving.h-add-missing-cstddef-heade.patch | 33 ---------------
> package/gnuradio/gnuradio.hash | 2 +-
> package/gnuradio/gnuradio.mk | 2 +-
> 4 files changed, 2 insertions(+), 77 deletions(-)
> delete mode 100644 package/gnuradio/0001-blocks-Including-missing-vector-in-blockinterleaver.patch
> delete mode 100644 package/gnuradio/0002-blocks-blockinterleaving.h-add-missing-cstddef-heade.patch
Thanks for your contribution. However, a newer version bump was
proposed and applied, see:
https://gitlab.com/buildroot.org/buildroot/-/commit/10f40a6b0c58a10f00d6a9b44fc76aea756e6036.
So I've marked this patch as Superseded.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-07-31 22:21 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-23 20:15 [Buildroot] [PATCH 1/2] package/gnuradio: bump to 3.10.5.1 Martin Böh via buildroot
2023-02-23 20:15 ` [Buildroot] [PATCH 2/2] package/gnuradio: remove pybind target suffix when crosscompiling Martin Böh via buildroot
2023-02-23 22:12 ` Thomas Petazzoni via buildroot
2023-07-31 22:21 ` Thomas Petazzoni via buildroot
2023-07-31 22:20 ` [Buildroot] [PATCH 1/2] package/gnuradio: bump to 3.10.5.1 Thomas Petazzoni via buildroot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox