diff mbox series

[v2,4/6] package/gnuradio: add python3 support

Message ID 20200117110232.31336-4-gwenj@trabucayre.com
State Accepted
Headers show
Series [v2,1/6] package/gqrx: backport/adapt patch to suppport Gnuradio 3.8 | expand

Commit Message

Gwenhael Goavec-Merou Jan. 17, 2020, 11:02 a.m. UTC 
From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>

gnuradio 3.8.0.0 support both python2 and python3.

Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
---
Changes v1 -> v2:
 * don't supress python2 support (Arnout)
 * add dependency to python2 or python3 to have correct python-mako version (Arnout)
---
 package/gnuradio/Config.in   | 2 +-
 package/gnuradio/gnuradio.mk | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

Comments

Thomas Petazzoni Feb. 3, 2020, 10:42 p.m. UTC | #1 
On Fri, 17 Jan 2020 12:02:30 +0100
Gwenhael Goavec-Merou <gwenj@trabucayre.com> wrote:

> From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
> 
> gnuradio 3.8.0.0 support both python2 and python3.
> 
> Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>

You forgot to drop the depends on !BR2_PACKAGE_PYTHON3 on the gnuradio
option... if you don't remove it, we still can't build gnuradio with
python3 enabled. So I've dropped it when applying.

Thanks!

Thomas
diff mbox series

Patch

diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in
index 72458f0961..c8b8d62264 100644
--- a/package/gnuradio/Config.in
+++ b/package/gnuradio/Config.in
@@ -65,7 +65,7 @@  config BR2_PACKAGE_GNURADIO_FEC
 
 config BR2_PACKAGE_GNURADIO_PYTHON
 	bool "python support"
-	depends on BR2_PACKAGE_PYTHON
+	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
 	depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy
 	select BR2_PACKAGE_BOOST_PYTHON
diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk
index a1dbb78e6e..41d4619f72 100644
--- a/package/gnuradio/gnuradio.mk
+++ b/package/gnuradio/gnuradio.mk
@@ -13,6 +13,7 @@  GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO
 
 # host-python-mako and host-python-six are needed for volk to compile
 GNURADIO_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) \
 	host-python-mako \
 	host-python-six \
 	host-swig \
@@ -107,7 +108,7 @@  GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y)
-GNURADIO_DEPENDENCIES += python
+GNURADIO_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python)
 GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON
 else
 GNURADIO_CONF_OPTS += -DENABLE_PYTHON=OFF