From: André Hentschel <nerv@dawncrow.de>
Date: Wed, 22 Jun 2016 17:00:16 +0000 (+0200)
Subject: fftw: Disable combined threads when building with OpenMP support
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0f163c819c4d8ee76c317ce45e71c9267bae28c1;p=buildroot.git

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>
---

diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk
index 5045ab6fed..e89671f9e2 100644
--- a/package/fftw/fftw.mk
+++ b/package/fftw/fftw.mk
@@ -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