浏览代码

protobuf: host-protobuf can only be built on certain architectures

The host-protobuf package can only build on certain architectures. For
example, host-protobuf does not build on PowerPC platforms, causing
build failures on the autobuilders. Since we don't really care about
build platforms other than x86 and x86-64, this commit restricts the
build of host-protobuf to these architectures only, even though if
technically it could build on ARM and MIPS.

Fixes:

 http://autobuild.buildroot.org/results/9b9/9b9b20b0e4694b11425cdc2382650cdc2774e400/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Thomas Petazzoni 11 年之前
父节点
当前提交
0f6fca6061

+ 2 - 0
package/collectd/Config.in

@@ -419,6 +419,8 @@ comment "rrdtool support needs a toolchain w/ wchar"
 config BR2_PACKAGE_COLLECTD_RIEMANN
 config BR2_PACKAGE_COLLECTD_RIEMANN
 	bool "riemann"
 	bool "riemann"
 	depends on BR2_INSTALL_LIBSTDCPP # protobuf
 	depends on BR2_INSTALL_LIBSTDCPP # protobuf
+	# protobuf-c -> host-protobuf
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_PACKAGE_PROTOBUF_C
 	select BR2_PACKAGE_PROTOBUF_C
 	help
 	help
 	  Sends data to Riemann, a stream processing and monitoring system.
 	  Sends data to Riemann, a stream processing and monitoring system.

+ 2 - 0
package/ola/Config.in

@@ -12,6 +12,8 @@ config BR2_PACKAGE_OLA
 	depends on BR2_USE_WCHAR # util-linux
 	depends on BR2_USE_WCHAR # util-linux
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_arm || BR2_i386 || BR2_mipsel || BR2_x86_64 # protobuf
 	depends on BR2_arm || BR2_i386 || BR2_mipsel || BR2_x86_64 # protobuf
+	# protobuf -> host-protobuf
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	help
 	help
 	  Open Lighting Architecture provides applications
 	  Open Lighting Architecture provides applications
 	  with a mechanism to send and receive DMX512 & RDM
 	  with a mechanism to send and receive DMX512 & RDM

+ 3 - 0
package/protobuf-c/Config.in

@@ -2,6 +2,8 @@ config BR2_PACKAGE_PROTOBUF_C
 	bool "protobuf-c"
 	bool "protobuf-c"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf
 	depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf
+	# host-protobuf only builds on certain architectures
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	help
 	help
 	  Code generator and runtime libraries to use Protocol Buffers
 	  Code generator and runtime libraries to use Protocol Buffers
 	  from pure C (not C++).
 	  from pure C (not C++).
@@ -10,3 +12,4 @@ config BR2_PACKAGE_PROTOBUF_C
 
 
 comment "protobuf-c needs a toolchain w/ C++, threads"
 comment "protobuf-c needs a toolchain w/ C++, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"

+ 3 - 0
package/protobuf/Config.in

@@ -5,6 +5,8 @@ config BR2_PACKAGE_PROTOBUF
 	# See src/google/protobuf/stubs/platform_macros.h for supported archs.
 	# See src/google/protobuf/stubs/platform_macros.h for supported archs.
 	# PowerPC doesn't actually work.
 	# PowerPC doesn't actually work.
 	depends on BR2_arm || BR2_i386 || BR2_mipsel || BR2_x86_64
 	depends on BR2_arm || BR2_i386 || BR2_mipsel || BR2_x86_64
+	# host-protobuf only builds on certain architectures
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	help
 	help
 	  Protocol buffers are Google's language-neutral, platform-neutral,
 	  Protocol buffers are Google's language-neutral, platform-neutral,
 	  extensible mechanism for serializing structured data.
 	  extensible mechanism for serializing structured data.
@@ -14,3 +16,4 @@ config BR2_PACKAGE_PROTOBUF
 comment "protobuf needs a toolchain w/ C++, threads"
 comment "protobuf needs a toolchain w/ C++, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_arm || BR2_i386 || BR2_mipsel || BR2_x86_64
 	depends on BR2_arm || BR2_i386 || BR2_mipsel || BR2_x86_64
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"

+ 2 - 0
package/python-protobuf/Config.in

@@ -1,6 +1,8 @@
 config BR2_PACKAGE_PYTHON_PROTOBUF
 config BR2_PACKAGE_PYTHON_PROTOBUF
 	bool "python-protobuf"
 	bool "python-protobuf"
 	depends on BR2_PACKAGE_PYTHON
 	depends on BR2_PACKAGE_PYTHON
+	# host-protobuf only builds on certain architectures
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	help
 	help
 	  Python implementation of the Google Protocol Buffers.
 	  Python implementation of the Google Protocol Buffers.