Skip to contentSkip to conversation

opencv: need threads support

PATCH New Samuel Martin 2 participants 3 messages Feb 5, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 opencv: need threads support

Because the opencv_core module needs threads support, just globally disable the whole opencv package if the toolchain does not offer this support.

Fixes:
http://autobuild.buildroot.org/results/8dd/8dd1674674018a931ba09cc5b414c32360e51692/build-end.log

---
 package/opencv/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
package/opencv/Config.in +3 -2
index 146011a..ccde5cb 100644
@@ -1,6 +1,7 @@
 menuconfig BR2_PACKAGE_OPENCV
 	bool "opencv"
 	select BR2_PACKAGE_ZLIB
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
 	help
@@ -208,5 +209,5 @@ config BR2_PACKAGE_OPENCV_INSTALL_DATA
 
 endif # BR2_PACKAGE_OPENCV
 
-comment "opencv needs a toolchain w/ C++, wchar"
-	depends on !(BR2_INSTALL_LIBSTDCPP  && BR2_USE_WCHAR)
+comment "opencv needs a toolchain w/ C++, threads, wchar"
+	depends on !(BR2_INSTALL_LIBSTDCPP  && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
Signature · 1 line
1.8.5.3
#1 lore raw

PATCH 2/2 opencv: cleanup depends and comments

Since the opencv package globally depends on BR2_TOOLCHAIN_HAS_THREADS and BR2_USE_WCHAR, then cleanup these redundant (and useless) dependencies in the opencv's sub-options.

---
 package/opencv/Config.in | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
package/opencv/Config.in +2 -10
index ccde5cb..dfdd93a 100644
@@ -140,20 +140,13 @@ comment "ffmpeg support needs a toolchain w/ largefile, IPv6"
 
 config BR2_PACKAGE_OPENCV_WITH_GSTREAMER
 	bool "gstreamer support"
-	depends on BR2_USE_WCHAR # gstreamer -> libglib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer -> libglib2
 	select BR2_PACKAGE_GSTREAMER
 	select BR2_PACKAGE_GST_PLUGINS_BASE
 	select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP
 
-comment "gstreamer support needs a toolchain w/ wchar, threads"
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
-
 config BR2_PACKAGE_OPENCV_WITH_GTK
 	bool "gtk support"
 	depends on BR2_PACKAGE_XORG7
-	depends on BR2_USE_WCHAR # libgtk2 -> libglib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2
 	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_LIBGTK2
 
@@ -188,13 +181,12 @@ config BR2_PACKAGE_OPENCV_WITH_TIFF
 config BR2_PACKAGE_OPENCV_WITH_V4L
 	bool "v4l support"
 	depends on BR2_LARGEFILE
-	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_LIBV4L
 	help
 	  Enable Video 4 Linux support.
 
-comment "v4l support needs a toolchain w/ largefile, threads"
-	depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS
+comment "v4l support needs a toolchain w/ largefile"
+	depends on !BR2_LARGEFILE
 
 comment "Install options"
 
Signature · 1 line
1.8.5.3
#2 lore raw

PATCH 1/2 opencv: need threads support

In reply to Samuel Martin
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Samuel" == Samuel Martin <[email protected]> writes:

Because the opencv_core module needs threads support, just globally disable the whole opencv package if the toolchain does not offer this support.

Fixes:
http://autobuild.buildroot.org/results/8dd/8dd1674674018a931ba09cc5b414c32360e51692/build-end.log

Committed both, thanks.

Signature · 1 line
Bye, Peter Korsgaard