fftw: Disable combined threads when building with OpenMP support

Otherwise fftw fails to configure:
configure: error: --with-combined-threads incompatible with --enable-openmp

Signed-off-by: André Hentschel <nerv@dawncrow.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
André Hentschel 2016-06-22 19:00:16 +02:00 committed by Thomas Petazzoni
parent d7dd1b8ad1
commit 0f163c819c

View file

@ -31,7 +31,8 @@ FFTW_CFLAGS += $(if $(BR2_PACKAGE_FFTW_USE_NEON),-mfpu=neon)
# Generic optimisations
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
FFTW_CONF_OPTS += --enable-threads --with-combined-threads
FFTW_CONF_OPTS += --enable-threads
FFTW_CONF_OPTS += $(if $(BR2_GCC_ENABLE_OPENMP),--without,--with)-combined-threads
else
FFTW_CONF_OPTS += --disable-threads
endif