Message ID | 1548078671-63318-12-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> > > This patch add an explicitly dependency to fftw-double (the only compatible > fftw's flavor) instead of default behavior where the package do assumption > about the compatible version. > > Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Regards, Yann E. MORIN. > --- > Changes v3 -> v4: > * improve commit message about fftw version. (Yann) > --- > package/imagemagick/imagemagick.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk > index 72482267ce..7678980582 100644 > --- a/package/imagemagick/imagemagick.mk > +++ b/package/imagemagick/imagemagick.mk > @@ -113,11 +113,11 @@ else > IMAGEMAGICK_CONF_OPTS += --without-lzma > endif > > -ifeq ($(BR2_PACKAGE_FFTW),y) > +ifeq ($(BR2_PACKAGE_FFTW_DOUBLE),y) > # configure script misdetects these leading to build errors > IMAGEMAGICK_CONF_ENV += ac_cv_func_creal=yes ac_cv_func_cimag=yes > IMAGEMAGICK_CONF_OPTS += --with-fftw > -IMAGEMAGICK_DEPENDENCIES += fftw > +IMAGEMAGICK_DEPENDENCIES += fftw-double > else > IMAGEMAGICK_CONF_OPTS += --without-fftw > endif > -- > 2.19.2 >
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 72482267ce..7678980582 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -113,11 +113,11 @@ else IMAGEMAGICK_CONF_OPTS += --without-lzma endif -ifeq ($(BR2_PACKAGE_FFTW),y) +ifeq ($(BR2_PACKAGE_FFTW_DOUBLE),y) # configure script misdetects these leading to build errors IMAGEMAGICK_CONF_ENV += ac_cv_func_creal=yes ac_cv_func_cimag=yes IMAGEMAGICK_CONF_OPTS += --with-fftw -IMAGEMAGICK_DEPENDENCIES += fftw +IMAGEMAGICK_DEPENDENCIES += fftw-double else IMAGEMAGICK_CONF_OPTS += --without-fftw endif