From: Gwenhael Goavec-Merou Date: Mon, 21 Jan 2019 13:51:02 +0000 (+0100) Subject: package/gnuradio: use the new fftw-single package X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=294d17d9bfb7a69d246a15796a131d02fe9c2088;p=buildroot.git 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 Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- 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