diff --git a/package/glog/Config.in b/package/glog/Config.in index bbdd1e2151..85873f02f0 100644 --- a/package/glog/Config.in +++ b/package/glog/Config.in @@ -2,11 +2,13 @@ config BR2_PACKAGE_GLOG bool "glog" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # C++14 help C++ implementation of the Google logging module https://github.com/google/glog -comment "glog needs a toolchain w/ C++, threads" +comment "glog needs a toolchain w/ C++, threads, gcc >= 6" depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_6 diff --git a/package/opencv4-contrib/Config.in b/package/opencv4-contrib/Config.in index 261d414869..d992c6d1ac 100644 --- a/package/opencv4-contrib/Config.in +++ b/package/opencv4-contrib/Config.in @@ -251,6 +251,7 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SALIENCY config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SFM bool "sfm" + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # glog select BR2_PACKAGE_OPENCV4_LIB_IMGPROC select BR2_PACKAGE_OPENCV4_LIB_IMGCODECS select BR2_PACKAGE_EIGEN @@ -261,6 +262,9 @@ config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SFM to perform 3d reconstruction from 2d images. The core of the module is a light version of Libmv. +comment "sfm needs a toolchain w/ gcc >= 6" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_6 + config BR2_PACKAGE_OPENCV4_CONTRIB_LIB_SHAPE bool "shape" help