jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 05:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

toolchain-external: CodeSourcery NiosII 2015.11 affected by PR19405

Browse Source 
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>
This commit is contained in:
Romain Naour 2016-02-20 13:42:46 +01:00 committed by Thomas Petazzoni
parent d2b6a496c6
commit 5dce3c05b5
9 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/grantlee/Config.in
View File

@ -3,6 +3,7 @@ config BR2_PACKAGE_GRANTLEE
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # Qt Script depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # Qt Script
depends on (BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT && BR2_PACKAGE_QT) || \ depends on (BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT && BR2_PACKAGE_QT) || \
(BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5) (BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5)
depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module
select BR2_PACKAGE_QT_STL if BR2_PACKAGE_QT select BR2_PACKAGE_QT_STL if BR2_PACKAGE_QT
select BR2_PACKAGE_QT_SCRIPT if BR2_PACKAGE_QT select BR2_PACKAGE_QT_SCRIPT if BR2_PACKAGE_QT
select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
@ -13,7 +14,8 @@ config BR2_PACKAGE_GRANTLEE
http://www.grantlee.org http://www.grantlee.org
comment "grantlee needs a toolchain with NPTL" comment "grantlee needs a toolchain with NPTL not affected by Binutils bug 19405"
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
depends on (BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT && BR2_PACKAGE_QT) || \ depends on (BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT && BR2_PACKAGE_QT) || \
(BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5) (BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5) || \
BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405

4
package/opencv/Config.in
View File

@ -225,6 +225,7 @@ config BR2_PACKAGE_OPENCV_WITH_QT
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_MMU # qt depends on BR2_USE_MMU # qt
depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI 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
select BR2_PACKAGE_QT_STL select BR2_PACKAGE_QT_STL
select BR2_PACKAGE_QT_GUI_MODULE select BR2_PACKAGE_QT_GUI_MODULE
@ -232,6 +233,9 @@ config BR2_PACKAGE_OPENCV_WITH_QT
help help
Use Qt with QtTest module and STL support 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 config BR2_PACKAGE_OPENCV_WITH_TIFF
bool "tiff support" bool "tiff support"
select BR2_PACKAGE_TIFF select BR2_PACKAGE_TIFF

5
package/opencv3/Config.in
View File

@ -84,15 +84,16 @@ comment "gtk3 support needs libgtk3"
config BR2_PACKAGE_OPENCV3_WITH_QT config BR2_PACKAGE_OPENCV3_WITH_QT
bool "qt4" bool "qt4"
depends on BR2_PACKAGE_QT 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_STL
select BR2_PACKAGE_QT_GUI_MODULE select BR2_PACKAGE_QT_GUI_MODULE
select BR2_PACKAGE_QT_TEST select BR2_PACKAGE_QT_TEST
help help
Use Qt4 with QtTest and QtGui modules and STL support, as GUI toolkit. 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_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 config BR2_PACKAGE_OPENCV3_WITH_QT5
bool "qt5" bool "qt5"

4
package/pinentry/Config.in
View File

@ -40,11 +40,15 @@ config BR2_PACKAGE_PINENTRY_QT4
depends on BR2_USE_MMU # fork depends on BR2_USE_MMU # fork
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module
select BR2_PACKAGE_QT select BR2_PACKAGE_QT
select BR2_PACKAGE_QT_GUI_MODULE select BR2_PACKAGE_QT_GUI_MODULE
help help
The pinentry-qt4 tool The pinentry-qt4 tool
comment "pinentry-qt4 support needs a toolchain not affected by Binutils bug 19405"
depends on BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405
comment "pinentry-qt4 needs a toolchain w/ C++, threads" comment "pinentry-qt4 needs a toolchain w/ C++, threads"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

4
package/poppler/Config.in
View File

@ -15,11 +15,15 @@ if BR2_PACKAGE_POPPLER
config BR2_PACKAGE_POPPLER_QT config BR2_PACKAGE_POPPLER_QT
bool "Qt support" bool "Qt support"
depends on BR2_PACKAGE_QT depends on BR2_PACKAGE_QT
depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module
select BR2_PACKAGE_QT_GUI_MODULE select BR2_PACKAGE_QT_GUI_MODULE
select BR2_PACKAGE_QT_XML select BR2_PACKAGE_QT_XML
help help
Build Qt support into the Poppler library Build Qt support into the Poppler library
comment "poppler Qt support needs a toolchain not affected by Binutils bug 19405"
depends on BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405
endif endif
comment "poppler needs a toolchain w/ C++, threads" comment "poppler needs a toolchain w/ C++, threads"

7
package/qt/Config.in
View File

@ -33,6 +33,7 @@ comment "Qt standard (X11) not available (need X.org)"
config BR2_PACKAGE_QT_X11 config BR2_PACKAGE_QT_X11
bool "Qt standard (X11)" bool "Qt standard (X11)"
depends on BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_XORG7
depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module
select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_FONTCONFIG
select BR2_PACKAGE_XLIB_LIBXI select BR2_PACKAGE_XLIB_LIBXI
select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBX11
@ -56,6 +57,7 @@ config BR2_PACKAGE_QT_DEBUG
config BR2_PACKAGE_QT_DEMOS config BR2_PACKAGE_QT_DEMOS
bool "Compile and install Qt demos (with code)" bool "Compile and install Qt demos (with code)"
depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module
select BR2_PACKAGE_QT_GUI_MODULE select BR2_PACKAGE_QT_GUI_MODULE
help help
If unsure, say N. If unsure, say N.
@ -69,6 +71,7 @@ config BR2_PACKAGE_QT_TRANSLATION_FILES
config BR2_PACKAGE_QT_EXAMPLES config BR2_PACKAGE_QT_EXAMPLES
bool "Compile and install Qt examples (with code)" bool "Compile and install Qt examples (with code)"
depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module
select BR2_PACKAGE_QT_GUI_MODULE select BR2_PACKAGE_QT_GUI_MODULE
help help
If unsure, say N. If unsure, say N.
@ -130,12 +133,16 @@ config BR2_PACKAGE_QT_QT3SUPPORT
config BR2_PACKAGE_QT_GUI_MODULE config BR2_PACKAGE_QT_GUI_MODULE
bool "Gui Module" bool "Gui Module"
depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # nios2 Binutils 2.25.1 bug
select BR2_PACKAGE_QT_NETWORK select BR2_PACKAGE_QT_NETWORK
default y default y
help help
Turns on support for Gui applications. If your board doesn't have Turns on support for Gui applications. If your board doesn't have
video output, or you don't require Qt GUI, say n. video output, or you don't require Qt GUI, say n.
comment "Qt Gui Module needs a toolchain not affected by Binutils bug 19405"
depends on BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405
if BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT_GUI_MODULE
if BR2_PACKAGE_QT_EMBEDDED if BR2_PACKAGE_QT_EMBEDDED

6
package/qwt/Config.in
View File

@ -1,6 +1,10 @@
comment "qwt needs a toolchain not affected by Binutils bug 19405"
depends on BR2_PACKAGE_QT && BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405
config BR2_PACKAGE_QWT config BR2_PACKAGE_QWT
bool "qwt" bool "qwt"
depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5 depends on (BR2_PACKAGE_QT && !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405) || \
BR2_PACKAGE_QT5
select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5
select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 # printsupport select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 # printsupport

4
toolchain/toolchain-common.in
View File

@ -5,6 +5,10 @@
# so put it here instead # so put it here instead
source "package/gdb/Config.in.host" source "package/gdb/Config.in.host"
# https://sourceware.org/bugzilla/show_bug.cgi?id=19405
config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405
bool
config BR2_TOOLCHAIN_HAS_NATIVE_RPC config BR2_TOOLCHAIN_HAS_NATIVE_RPC
bool bool

1
toolchain/toolchain-external/Config.in
View File

@ -413,6 +413,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII
select BR2_HOSTARCH_NEEDS_IA32_LIBS select BR2_HOSTARCH_NEEDS_IA32_LIBS
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2 select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2
select BR2_TOOLCHAIN_GCC_AT_LEAST_5 select BR2_TOOLCHAIN_GCC_AT_LEAST_5
select BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # based-on binutils-2.25.1
help help
Sourcery CodeBench toolchain for the Nios-II architecture, Sourcery CodeBench toolchain for the Nios-II architecture,
from Mentor Graphics. It uses gcc 5.2, binutils 2.25.51, from Mentor Graphics. It uses gcc 5.2, binutils 2.25.51,