Sākums Izpētīt Palīdzība
Reģistrēties Pierakstīties
PUBLIC_REPOS
/
buildroot
spogulis no git://git.buildroot.net/buildroot
2
1
Atdalīts 0
Faili
Pārlūkot izejas kodu

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>
Romain Naour 8 gadi atpakaļ
vecāks
fb71372d5f
revīzija
519b96ad87
8 mainītis faili ar 3 papildinājumiem un 35 dzēšanām
Apvienotais skats Rādīt salīdzināšanas statistiku
  1. 0 7
      package/opencv/Config.in
  2. 2 3
      package/opencv3/Config.in
  3. 0 4
      package/pinentry/Config.in
  4. 0 4
      package/poppler/Config.in
  5. 0 7
      package/qt/Config.in
  6. 1 5
      package/qwt/Config.in
  7. 0 4
      toolchain/toolchain-common.in
  8. 0 1
      toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in

+ 0 - 7
package/opencv/Config.in
Parādīt failu 

@@ -51,7 +51,6 @@ 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
 
 	depends on !BR2_STATIC_LIBS
 
 	depends on !BR2_STATIC_LIBS
 
 	select BR2_PACKAGE_OPENCV_LIB_CALIB3D
 
 	select BR2_PACKAGE_OPENCV_LIB_CALIB3D
 
 	select BR2_PACKAGE_OPENCV_LIB_IMGPROC
 
 	select BR2_PACKAGE_OPENCV_LIB_IMGPROC
 
@@ -114,7 +113,6 @@ 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.
 
@@ -162,7 +160,6 @@ 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
 
@@ -272,7 +269,6 @@ 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
 
@@ -280,9 +276,6 @@ 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

+ 2 - 3
package/opencv3/Config.in
Parādīt failu 

@@ -85,16 +85,15 @@ 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 and a toolchain not affected by Binutils bug 19405"
 
+comment "qt4 support needs qt"
 
 	depends on BR2_USE_MMU # 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
 
 config BR2_PACKAGE_OPENCV3_WITH_QT5
 
 	bool "qt5"
 
 	bool "qt5"

+ 0 - 4
package/pinentry/Config.in
Parādīt failu 

@@ -40,15 +40,11 @@ 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

+ 0 - 4
package/poppler/Config.in
Parādīt failu 

@@ -15,15 +15,11 @@ 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
 
-
 
 config BR2_PACKAGE_POPPLER_QT5
 
 config BR2_PACKAGE_POPPLER_QT5
 
 	bool "Qt5 support"
 
 	bool "Qt5 support"
 
 	depends on BR2_PACKAGE_QT5
 
 	depends on BR2_PACKAGE_QT5

+ 0 - 7
package/qt/Config.in
Parādīt failu 

@@ -33,7 +33,6 @@ 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
 
@@ -57,7 +56,6 @@ 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.
 
@@ -71,7 +69,6 @@ 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.
 
@@ -124,15 +121,11 @@ config BR2_PACKAGE_QT_QT3SUPPORT
 
 config BR2_PACKAGE_QT_GUI_MODULE
 
 config BR2_PACKAGE_QT_GUI_MODULE
 
 	bool "Gui Module"
 
 	bool "Gui Module"
 
 	default y
 
 	default y
 
-	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # nios2 Binutils 2.25.1 bug
 
 	select BR2_PACKAGE_QT_NETWORK
 
 	select BR2_PACKAGE_QT_NETWORK
 
 	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

+ 1 - 5
package/qwt/Config.in
Parādīt failu 

@@ -1,10 +1,6 @@
 
-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_TOOLCHAIN_HAS_BINUTILS_BUG_19405) || \
 
-		BR2_PACKAGE_QT5
 
+	depends on BR2_PACKAGE_QT || 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

+ 0 - 4
toolchain/toolchain-common.in
Parādīt failu 

@@ -18,10 +18,6 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_64735
 
 	default y if BR2_ARM_CPU_ARMV5
 
 	default y if BR2_ARM_CPU_ARMV5
 
 	default y if BR2_sparc_v8
 
 	default y if BR2_sparc_v8
 
 
 
-# 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

+ 0 - 1
toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in
Parādīt failu 

@@ -10,7 +10,6 @@ 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_7
 
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7
 
 	select BR2_TOOLCHAIN_GCC_AT_LEAST_6
 
 	select BR2_TOOLCHAIN_GCC_AT_LEAST_6
 
-	select BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # based-on binutils-2.26
 
 	help
 
 	help
 
 	  Sourcery CodeBench toolchain for the Nios-II architecture,
 
 	  Sourcery CodeBench toolchain for the Nios-II architecture,
 
 	  from Mentor Graphics. It uses gcc 6.3, binutils 2.26,
 
 	  from Mentor Graphics. It uses gcc 6.3, binutils 2.26,