[Buildroot] [git commit] package/opencv4: add tbb support

[Arnout Vandecappelle (Essensium/Mind)]

commit: https://git.buildroot.net/buildroot/commit/?id=7a441e4cf967094f2e2429a37dd2107bb91d2a81
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
---
 package/opencv4/Config.in  | 14 ++++++++++++++
 package/opencv4/opencv4.mk | 10 ++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/package/opencv4/Config.in b/package/opencv4/Config.in
index 31c32385da..23d34a9d22 100644
--- a/package/opencv4/Config.in
+++ b/package/opencv4/Config.in
@@ -309,6 +309,20 @@ config BR2_PACKAGE_OPENCV4_WITH_PROTOBUF
 	help
 	  Use shared protobuf from the target system.
 
+config BR2_PACKAGE_OPENCV4_WITH_TBB
+	bool "tbb support"
+	depends on !BR2_TOOLCHAIN_USES_UCLIBC # tbb
+	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # tbb
+	select BR2_PACKAGE_TBB
+	help
+	  Use shared tbb from the target system.
+
+comment "tbb needs a glibc or musl toolchain"
+	depends on BR2_TOOLCHAIN_USES_UCLIBC
+
+comment "tbb needs exception_ptr"
+	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
+
 config BR2_PACKAGE_OPENCV4_WITH_TIFF
 	bool "tiff support"
 	select BR2_PACKAGE_TIFF
diff --git a/package/opencv4/opencv4.mk b/package/opencv4/opencv4.mk
index e75f7144de..0563026b18 100644
--- a/package/opencv4/opencv4.mk
+++ b/package/opencv4/opencv4.mk
@@ -155,8 +155,7 @@ OPENCV4_CONF_OPTS += \
 	-DBUILD_WITH_DYNAMIC_IPP=OFF \
 	-DWITH_INTELPERC=OFF \
 	-DWITH_IPP=OFF \
-	-DWITH_IPP_A=OFF \
-	-DWITH_TBB=OFF
+	-DWITH_IPP_A=OFF
 
 # Smartek stuff
 OPENCV4_CONF_OPTS += -DWITH_GIGEAPI=OFF
@@ -313,6 +312,13 @@ else
 OPENCV4_CONF_OPTS += -DWITH_QT=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_OPENCV4_WITH_TBB),y)
+OPENCV4_CONF_OPTS += -DWITH_TBB=ON
+OPENCV4_DEPENDENCIES += tbb
+else
+OPENCV4_CONF_OPTS += -DWITH_TBB=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_OPENCV4_WITH_TIFF),y)
 OPENCV4_CONF_OPTS += -DWITH_TIFF=ON
 OPENCV4_DEPENDENCIES += tiff