| Message ID | 1548078671-63318-15-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> > > Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> I still believe this change to be incorrect, since liquiddsp only really supports fftw-single, as patch 17 states. So, at the very least, I believe tpatch 17 should be squashed into this one, and an even better solution would be to actually fix the package in a previous patch, as I said in my previous review. Regards, Yann E. MORIN. > --- > package/liquid-dsp/liquid-dsp.mk | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/package/liquid-dsp/liquid-dsp.mk b/package/liquid-dsp/liquid-dsp.mk > index db67893844..6aa27a5248 100644 > --- a/package/liquid-dsp/liquid-dsp.mk > +++ b/package/liquid-dsp/liquid-dsp.mk > @@ -30,9 +30,9 @@ LIQUID_DSP_CFLAGS += -ffast-math > endif > > # use FFTW instead of built-in FFT > -ifeq ($(BR2_PACKAGE_FFTW_PRECISION_SINGLE),y) > +ifeq ($(BR2_PACKAGE_FFTW_SINGLE),y) > LIQUID_DSP_LDFLAGS += -lfftw3f > -LIQUID_DSP_DEPENDENCIES += fftw > +LIQUID_DSP_DEPENDENCIES += fftw-single > endif > > # disable altivec, it has build issues > @@ -40,14 +40,14 @@ ifeq ($(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),y) > LIQUID_DSP_CONF_OPTS += --enable-simdoverride > endif > > -ifeq ($(BR2_PACKAGE_FFTW_PRECISION_DOUBLE),y) > +ifeq ($(BR2_PACKAGE_FFTW_DOUBLE),y) > LIQUID_DSP_LDFLAGS += -lfftw3 > -LIQUID_DSP_DEPENDENCIES += fftw > +LIQUID_DSP_DEPENDENCIES += fftw-double > endif > > -ifeq ($(BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE),y) > +ifeq ($(BR2_PACKAGE_FFTW_LONG_DOUBLE),y) > LIQUID_DSP_LDFLAGS += -lfftw3l > -LIQUID_DSP_DEPENDENCIES += fftw > +LIQUID_DSP_DEPENDENCIES += fftw-long-double > endif > > LIQUID_DSP_CONF_OPTS += \ > -- > 2.19.2 >
diff --git a/package/liquid-dsp/liquid-dsp.mk b/package/liquid-dsp/liquid-dsp.mk index db67893844..6aa27a5248 100644 --- a/package/liquid-dsp/liquid-dsp.mk +++ b/package/liquid-dsp/liquid-dsp.mk @@ -30,9 +30,9 @@ LIQUID_DSP_CFLAGS += -ffast-math endif # use FFTW instead of built-in FFT -ifeq ($(BR2_PACKAGE_FFTW_PRECISION_SINGLE),y) +ifeq ($(BR2_PACKAGE_FFTW_SINGLE),y) LIQUID_DSP_LDFLAGS += -lfftw3f -LIQUID_DSP_DEPENDENCIES += fftw +LIQUID_DSP_DEPENDENCIES += fftw-single endif # disable altivec, it has build issues @@ -40,14 +40,14 @@ ifeq ($(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),y) LIQUID_DSP_CONF_OPTS += --enable-simdoverride endif -ifeq ($(BR2_PACKAGE_FFTW_PRECISION_DOUBLE),y) +ifeq ($(BR2_PACKAGE_FFTW_DOUBLE),y) LIQUID_DSP_LDFLAGS += -lfftw3 -LIQUID_DSP_DEPENDENCIES += fftw +LIQUID_DSP_DEPENDENCIES += fftw-double endif -ifeq ($(BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE),y) +ifeq ($(BR2_PACKAGE_FFTW_LONG_DOUBLE),y) LIQUID_DSP_LDFLAGS += -lfftw3l -LIQUID_DSP_DEPENDENCIES += fftw +LIQUID_DSP_DEPENDENCIES += fftw-long-double endif LIQUID_DSP_CONF_OPTS += \