diff options
| author | Romain Naour <romain.naour@gmail.com> | 2017-05-06 15:54:20 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-05-07 22:09:17 +0200 |
| commit | 519b96ad8726843cbae5be5b52cdeb395ca9c7e2 (patch) | |
| tree | ae7c54dad2a673a333070f54a57632526106e1d6 /package/opencv | |
| parent | fb71372d5f59de5ae3eaece431fcfb007b264008 (diff) | |
| download | buildroot-519b96ad8726843cbae5be5b52cdeb395ca9c7e2.tar.gz buildroot-519b96ad8726843cbae5be5b52cdeb395ca9c7e2.zip | |
Revert "toolchain-external: CodeSourcery NiosII 2015.11 affected by PR19405"
An autobuilder exception has been added to avoid testing qt gui module
with the CodeSourcery NiosII toolchain. This allow to remove the
BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 symbol.
This reverts commit 5dce3c05b5ea38539f6ee6efc24c13db936260dc.
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/opencv')
| -rw-r--r-- | package/opencv/Config.in | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/package/opencv/Config.in b/package/opencv/Config.in index 0260851340..742ae3ebba 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -51,7 +51,6 @@ config BR2_PACKAGE_OPENCV_LIB_FLANN config BR2_PACKAGE_OPENCV_LIB_GPU bool "gpu" - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # opencv libphoto depends on !BR2_STATIC_LIBS select BR2_PACKAGE_OPENCV_LIB_CALIB3D select BR2_PACKAGE_OPENCV_LIB_IMGPROC @@ -114,7 +113,6 @@ config BR2_PACKAGE_OPENCV_LIB_OBJDETECT config BR2_PACKAGE_OPENCV_LIB_PHOTO bool "photo" default y - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Binutils 2.25 nios2 issue select BR2_PACKAGE_OPENCV_LIB_IMGPROC help Include opencv_photo module into the OpenCV build. @@ -162,7 +160,6 @@ config BR2_PACKAGE_OPENCV_LIB_VIDEO config BR2_PACKAGE_OPENCV_LIB_VIDEOSTAB bool "videostab" default y - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # opencv libphoto select BR2_PACKAGE_OPENCV_LIB_CALIB3D select BR2_PACKAGE_OPENCV_LIB_FEATURES2D select BR2_PACKAGE_OPENCV_LIB_HIGHGUI @@ -272,7 +269,6 @@ config BR2_PACKAGE_OPENCV_WITH_QT depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_MMU # qt depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module select BR2_PACKAGE_QT select BR2_PACKAGE_QT_STL select BR2_PACKAGE_QT_GUI_MODULE @@ -280,9 +276,6 @@ config BR2_PACKAGE_OPENCV_WITH_QT help Use Qt with QtTest module and STL support -comment "qt backend support needs a toolchain not affected by Binutils bug 19405" - depends on BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 - config BR2_PACKAGE_OPENCV_WITH_TIFF bool "tiff support" select BR2_PACKAGE_TIFF |
