summaryrefslogtreecommitdiff
path: root/package/opencv3
diff options
context:
space:
mode:
authorRomain Naour <romain.naour@gmail.com>2016-02-20 13:42:46 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-04-20 23:20:58 +0200
commit5dce3c05b5ea38539f6ee6efc24c13db936260dc (patch)
tree5cd65bb9f90ee68de0c407f039d4da375e2c9402 /package/opencv3
parentd2b6a496c6988da77092c3a2b059cf897f4693bf (diff)
toolchain-external: CodeSourcery NiosII 2015.11 affected by PR19405
See bug report https://sourceware.org/bugzilla/show_bug.cgi?id=19405 Fixes: http://autobuild.buildroot.net/results/ee562524c5b12191e584ceae89006c5a5103e700 Signed-off-by: Romain Naour <romain.naour@gmail.com> [Thomas: - rename BR2_TOOLCHAIN_BINUTILS_HAS_BUG_19405 to BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 - propagate to the qwt package, which is now selecting BR2_PACKAGE_QT_GUI_MODULE.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/opencv3')
-rw-r--r--package/opencv3/Config.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/package/opencv3/Config.in b/package/opencv3/Config.in
index 31fd98a36..9629a643e 100644
--- a/package/opencv3/Config.in
+++ b/package/opencv3/Config.in
@@ -84,15 +84,16 @@ comment "gtk3 support needs libgtk3"
config BR2_PACKAGE_OPENCV3_WITH_QT
bool "qt4"
depends on BR2_PACKAGE_QT
+ depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module
select BR2_PACKAGE_QT_STL
select BR2_PACKAGE_QT_GUI_MODULE
select BR2_PACKAGE_QT_TEST
help
Use Qt4 with QtTest and QtGui modules and STL support, as GUI toolkit.
-comment "qt4 support needs qt"
+comment "qt4 support needs qt and a toolchain not affected by Binutils bug 19405"
depends on BR2_USE_MMU # qt
- depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5
+ depends on (!BR2_PACKAGE_QT && !BR2_PACKAGE_QT5) || BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405
config BR2_PACKAGE_OPENCV3_WITH_QT5
bool "qt5"