Selaa lähdekoodia

package/jq: needs threads

threads is a strong requirement since
https://github.com/stedolan/jq/commit/cf4b48c7ba30cb30e116b523cff036ea481459f6

Fixes:
 - http://autobuild.buildroot.org/results/b871cc175655c2d6aa5f184d891b994a0ebd9902

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 826587fa4834ed8da03682df605d1ba51d4b7675)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Fabrice Fontaine 5 vuotta sitten
vanhempi
commit
b85b1e03c5
2 muutettua tiedostoa jossa 7 lisäystä ja 1 poistoa
  1. 4 0
      package/jq/Config.in
  2. 3 1
      package/sysdig/Config.in

+ 4 - 0
package/jq/Config.in

@@ -1,8 +1,12 @@
 config BR2_PACKAGE_JQ
 config BR2_PACKAGE_JQ
 	bool "jq"
 	bool "jq"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	help
 	  jq is like sed for JSON data - you can use it to slice and
 	  jq is like sed for JSON data - you can use it to slice and
 	  filter and map and transform structured data with the same
 	  filter and map and transform structured data with the same
 	  ease that sed, awk, grep and friends let you play with text.
 	  ease that sed, awk, grep and friends let you play with text.
 
 
 	  http://stedolan.github.io/jq/
 	  http://stedolan.github.io/jq/
+
+comment "jq needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

+ 3 - 1
package/sysdig/Config.in

@@ -4,6 +4,7 @@ config BR2_PACKAGE_SYSDIG
 	depends on BR2_INSTALL_LIBSTDCPP # libjson
 	depends on BR2_INSTALL_LIBSTDCPP # libjson
 	depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+	depends on BR2_TOOLCHAIN_HAS_THREADS # jq
 	depends on !BR2_STATIC_LIBS # luajit, elfutils
 	depends on !BR2_STATIC_LIBS # luajit, elfutils
 	depends on BR2_USE_WCHAR # elfutils
 	depends on BR2_USE_WCHAR # elfutils
 	depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils
 	depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils
@@ -25,8 +26,9 @@ config BR2_PACKAGE_SYSDIG
 
 
 	  https://github.com/draios/sysdig/wiki
 	  https://github.com/draios/sysdig/wiki
 
 
-comment "sysdig needs a glibc or uclibc toolchain w/ C++, gcc >= 4.8, dynamic library and a Linux kernel to be built"
+comment "sysdig needs a glibc or uclibc toolchain w/ C++, threads, gcc >= 4.8, dynamic library and a Linux kernel to be built"
 	depends on !BR2_LINUX_KERNEL || !BR2_INSTALL_LIBSTDCPP \
 	depends on !BR2_LINUX_KERNEL || !BR2_INSTALL_LIBSTDCPP \
+		|| !BR2_TOOLCHAIN_HAS_THREADS \
 		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_STATIC_LIBS \
 		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_STATIC_LIBS \
 		|| !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)
 		|| !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)
 	depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS