| Message ID | 1441215894-31473-1-git-send-email-gwenj@trabucayre.com |
|---|---|
| State | Superseded |
| Headers | show |
Dear Gwenhael Goavec-Merou, On Wed, 2 Sep 2015 19:44:54 +0200, Gwenhael Goavec-Merou wrote: > From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > > Some python blocks needs python-numpy present. > > Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> Hum, this commit log doesn't quite explain what's going, I believe. At least not sufficiently. > --- > package/gnuradio/Config.in | 9 ++++++++- > package/gnuradio/gnuradio.mk | 2 +- > 2 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in > index e264a21..ea37d74 100644 > --- a/package/gnuradio/Config.in > +++ b/package/gnuradio/Config.in > @@ -43,16 +43,23 @@ config BR2_PACKAGE_GNURADIO_FEC > help > FEC signal processing blocks > > +comment "gr-python depends on numpy" > + depends on !BR2_PACKAGE_PYTHON_NUMPY > + > config BR2_PACKAGE_GNURADIO_PYTHON > bool "python support" > + depends on BR2_PACKAGE_PYTHON_NUMPY > select BR2_PACKAGE_BOOST_PYTHON > select BR2_PACKAGE_PYTHON It's really weird to "select BR2_PACKAGE_PYTHON", but to "depends on BR2_PACKAGE_PYTHON_NUMPY". If anything, it would make a lot more sense to do the opposite: hide the Python support option is Python is not available (using a "depends on BR2_PACKAGE_PYTHON), and once Python is available and this option is enabled, automatically enabled Python Numpy. Or maybe you were worried about the architecture dependencies of Python Numpy, and the fact that duplicating them in gnuradio isn't nice? In this case, introduce a BR2_PACKAGE_GNURADIO_ARCH_SUPPORTS hidden variable in package/python-numpy/Config.in. Grep for other ARCH_SUPPORTS variable to see how they are used. Thanks, Thomas
diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index e264a21..ea37d74 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -43,16 +43,23 @@ config BR2_PACKAGE_GNURADIO_FEC help FEC signal processing blocks +comment "gr-python depends on numpy" + depends on !BR2_PACKAGE_PYTHON_NUMPY + config BR2_PACKAGE_GNURADIO_PYTHON bool "python support" + depends on BR2_PACKAGE_PYTHON_NUMPY select BR2_PACKAGE_BOOST_PYTHON select BR2_PACKAGE_PYTHON help Enable python component +comment "gr-utils depends on gr-python" + depends on !BR2_PACKAGE_GNURADIO_PYTHON + config BR2_PACKAGE_GNURADIO_UTILS bool "gr-utils support" - select BR2_PACKAGE_GNURADIO_PYTHON + depends on BR2_PACKAGE_GNURADIO_PYTHON help Misc python utilities diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index fc5cd1f..565c113 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -86,7 +86,7 @@ GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF endif ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) -GNURADIO_DEPENDENCIES += python +GNURADIO_DEPENDENCIES += python python-numpy GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON else GNURADIO_CONF_OPTS += -DENABLE_PYTHON=OFF