package: use BR2_TOOLCHAIN_HAS_OPENMP

Switch from using BR2_GCC_ENABLE_OPENMP to BR2_TOOLCHAIN_HAS_OPENMP to
determine OpenMP support in the following packages:

fftw
flann
opencv3

Signed-off-by: Ed Blake <ed.blake@sondrel.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk
index bcfdb9c96a3bcea7693392b32837effd0c1a4894..279244a5dcef7c2dd10aab5d08d470d84551cff2 100644 (file)
--- a/package/fftw/fftw.mk
+++ b/package/fftw/fftw.mk
@@ -27,10 +27,10 @@ endif
 # Generic optimisations
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
 FFTW_COMMON_CONF_OPTS += --enable-threads
-FFTW_COMMON_CONF_OPTS += $(if $(BR2_GCC_ENABLE_OPENMP),--without,--with)-combined-threads
+FFTW_COMMON_CONF_OPTS += $(if $(BR2_TOOLCHAIN_HAS_OPENMP),--without,--with)-combined-threads
 else
 FFTW_COMMON_CONF_OPTS += --disable-threads
 endif
-FFTW_COMMON_CONF_OPTS += $(if $(BR2_GCC_ENABLE_OPENMP),--enable,--disable)-openmp
+FFTW_COMMON_CONF_OPTS += $(if $(BR2_TOOLCHAIN_HAS_OPENMP),--enable,--disable)-openmp
 
 include $(sort $(wildcard package/fftw/*/*.mk))

diff --git a/package/flann/flann.mk b/package/flann/flann.mk
index ef61815bbabfb3973cee279e9b38429c5bcc22a8..d091ec18a0ce2a464377a65cba54570427dc345c 100644 (file)
--- a/package/flann/flann.mk
+++ b/package/flann/flann.mk
@@ -14,7 +14,7 @@ FLANN_CONF_OPTS = \
        -DBUILD_PYTHON_BINDINGS=OFF \
        -DBUILD_MATLAB_BINDINGS=OFF \
        -DBUILD_EXAMPLES=$(if $(BR2_PACKAGE_FLANN_EXAMPLES),ON,OFF) \
-       -DUSE_OPENMP=$(if $(BR2_GCC_ENABLE_OPENMP),ON,OFF) \
+       -DUSE_OPENMP=$(if $(BR2_TOOLCHAIN_HAS_OPENMP),ON,OFF) \
        -DPYTHON_EXECUTABLE=OFF \
        -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=TRUE
 

diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk
index 3a2594b5846dcfca7812cb930aed436a666e54a6..292ce814322c9380c5b878f808b04b79580f222a 100644 (file)
--- a/package/opencv3/opencv3.mk
+++ b/package/opencv3/opencv3.mk
@@ -279,7 +279,7 @@ else
 OPENCV3_CONF_OPTS += -DWITH_OPENGL=OFF
 endif
 
-OPENCV3_CONF_OPTS += -DWITH_OPENMP=$(if $(BR2_GCC_ENABLE_OPENMP),ON,OFF)
+OPENCV3_CONF_OPTS += -DWITH_OPENMP=$(if $(BR2_TOOLCHAIN_HAS_OPENMP),ON,OFF)
 
 ifeq ($(BR2_PACKAGE_OPENCV3_WITH_PNG),y)
 OPENCV3_CONF_OPTS += -DWITH_PNG=ON