Home Explore Help
Sign In
PUBLIC_REPOS
/
buildroot
mirror of git://git.buildroot.net/buildroot
2
1
Fork 0
Files
Browse Source

package/opencv: disable toolchains affected by PR19405

opencv libphoto fail to link with the following error:
nios2-linux-gnu/bin/ld: BFD (Sourcery CodeBench Lite 2015.11-130) 2.25.51
assertion fail binutils-src-2015.11-130-nios2-linux-gnu-i686-pc-linux-gnu/bfd/elf32-nios2.c:1908

Fixes:
http://autobuild.buildroot.net/results/fd0cc1cb09d07be94770d984efb28eea7c6f25b7

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Romain Naour 9 years ago
parent
f9d311edc6
commit
59679785e8
1 changed files with 3 additions and 0 deletions
Unified View Show Diff Stats
  1. 3 0
      package/opencv/Config.in

+ 3 - 0
package/opencv/Config.in
View File 

@@ -51,6 +51,7 @@ config BR2_PACKAGE_OPENCV_LIB_FLANN
 
 
 
 config BR2_PACKAGE_OPENCV_LIB_GPU
 
 config BR2_PACKAGE_OPENCV_LIB_GPU
 
 	bool "gpu"
 
 	bool "gpu"
 
+	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # opencv libphoto
 
 	select BR2_PACKAGE_OPENCV_LIB_CALIB3D
 
 	select BR2_PACKAGE_OPENCV_LIB_CALIB3D
 
 	select BR2_PACKAGE_OPENCV_LIB_IMGPROC
 
 	select BR2_PACKAGE_OPENCV_LIB_IMGPROC
 
 	select BR2_PACKAGE_OPENCV_LIB_LEGACY
 
 	select BR2_PACKAGE_OPENCV_LIB_LEGACY
 
@@ -109,6 +110,7 @@ config BR2_PACKAGE_OPENCV_LIB_OBJDETECT
 
 config BR2_PACKAGE_OPENCV_LIB_PHOTO
 
 config BR2_PACKAGE_OPENCV_LIB_PHOTO
 
 	bool "photo"
 
 	bool "photo"
 
 	default y
 
 	default y
 
+	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Binutils 2.25 nios2 issue
 
 	select BR2_PACKAGE_OPENCV_LIB_IMGPROC
 
 	select BR2_PACKAGE_OPENCV_LIB_IMGPROC
 
 	help
 
 	help
 
 	  Include opencv_photo module into the OpenCV build.
 
 	  Include opencv_photo module into the OpenCV build.
 
@@ -156,6 +158,7 @@ config BR2_PACKAGE_OPENCV_LIB_VIDEO
 
 config BR2_PACKAGE_OPENCV_LIB_VIDEOSTAB
 
 config BR2_PACKAGE_OPENCV_LIB_VIDEOSTAB
 
 	bool "videostab"
 
 	bool "videostab"
 
 	default y
 
 	default y
 
+	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # opencv libphoto
 
 	select BR2_PACKAGE_OPENCV_LIB_CALIB3D
 
 	select BR2_PACKAGE_OPENCV_LIB_CALIB3D
 
 	select BR2_PACKAGE_OPENCV_LIB_FEATURES2D
 
 	select BR2_PACKAGE_OPENCV_LIB_FEATURES2D
 
 	select BR2_PACKAGE_OPENCV_LIB_HIGHGUI
 
 	select BR2_PACKAGE_OPENCV_LIB_HIGHGUI