| Message ID | 1548078671-63318-8-git-send-email-gwenj@trabucayre.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v4,01/17] package/fftw: prepare for splitting into multiple packages | expand |
Gwenhael, All, On 2019-01-21 14:51 +0100, Gwenhael Goavec-Merou spake thusly: > From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > > 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> (I could turn my head I say so to you, but then it would be less fun!) Regards, Yann E. MORIN. > --- > package/gnuradio/Config.in | 8 ++------ > package/gnuradio/gnuradio.mk | 2 +- > 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 > -- > 2.19.2 >
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