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/opencv3 | |
| 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/opencv3')
| -rw-r--r-- | package/opencv3/Config.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/package/opencv3/Config.in b/package/opencv3/Config.in index 3b0a9d60c9..2214ee80ca 100644 --- a/package/opencv3/Config.in +++ b/package/opencv3/Config.in @@ -85,16 +85,15 @@ 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 and a toolchain not affected by Binutils bug 19405" +comment "qt4 support needs qt" depends on BR2_USE_MMU # qt - depends on (!BR2_PACKAGE_QT && !BR2_PACKAGE_QT5) || BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 + depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5 config BR2_PACKAGE_OPENCV3_WITH_QT5 bool "qt5" |
