summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>2019-01-21 14:51:02 +0100
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2019-02-06 10:14:46 +0100
commit294d17d9bfb7a69d246a15796a131d02fe9c2088 (patch)
tree7b843cd7dfe01d15ecfbb652531c873ead0e7d32
parentf2519d99345be4f9aee92c8e1645548f76ae0f66 (diff)
downloadbuildroot-294d17d9bfb7a69d246a15796a131d02fe9c2088.tar.gz
buildroot-294d17d9bfb7a69d246a15796a131d02fe9c2088.zip
package/gnuradio: use the new fftw-single package
Thanks to the new fftw package organization, we can use a "select" instead of "depends on". Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/gnuradio/Config.in8
-rw-r--r--package/gnuradio/gnuradio.mk2
2 files changed, 3 insertions, 7 deletions
diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in
index 56957d59e4..533a49c81e 100644
--- a/package/gnuradio/Config.in
+++ b/package/gnuradio/Config.in
@@ -78,11 +78,6 @@ config BR2_PACKAGE_GNURADIO_ZEROMQ
help
zeromq communication support
-comment "gr-fft, -filter, -analog, -channels, -digital, -trellis, -pager, -qtgui depends fftw's single precision"
- depends on !BR2_PACKAGE_FFTW_PRECISION_SINGLE
-
-if BR2_PACKAGE_FFTW_PRECISION_SINGLE
-
config BR2_PACKAGE_GNURADIO_ANALOG
bool "gr-analog support"
select BR2_PACKAGE_GNURADIO_FILTER
@@ -103,6 +98,8 @@ config BR2_PACKAGE_GNURADIO_DIGITAL
config BR2_PACKAGE_GNURADIO_FFT
bool "gr-fft support"
+ select BR2_PACKAGE_FFTW
+ select BR2_PACKAGE_FFTW_SINGLE
select BR2_PACKAGE_GNURADIO_BLOCKS
help
FFT signal processing blocks
@@ -136,4 +133,3 @@ config BR2_PACKAGE_GNURADIO_TRELLIS
Trellis coded modulation blocks
endif
-endif
diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk
index ed537e3934..564ad8b2a4 100644
--- a/package/gnuradio/gnuradio.mk
+++ b/package/gnuradio/gnuradio.mk
@@ -101,7 +101,7 @@ GNURADIO_CONF_OPTS += -DENABLE_GR_FEC=OFF
endif
ifeq ($(BR2_PACKAGE_GNURADIO_FFT),y)
-GNURADIO_DEPENDENCIES += fftw
+GNURADIO_DEPENDENCIES += fftw-single
GNURADIO_CONF_OPTS += -DENABLE_GR_FFT=ON
else
GNURADIO_CONF_OPTS += -DENABLE_GR_FFT=OFF
OpenPOWER on IntegriCloud