Преглед на файлове

package/protobuf: add additional supported host architectures

Move supported host architectures under
BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS and propagate the reverse
dependency.

Add additional supported host architectures based on current
src/google/protobuf/stubs/platform_macros.h

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
James Hilliard преди 3 години
родител
ревизия
d949b4e26b
променени са 6 файла, в които са добавени 25 реда и са изтрити 11 реда
  1. 3 3
      package/collectd/Config.in
  2. 2 2
      package/kismet/Config.in
  3. 2 2
      package/protobuf-c/Config.in
  4. 15 1
      package/protobuf/Config.in
  5. 1 1
      package/python-protobuf/Config.in
  6. 2 2
      package/riemann-c-client/Config.in

+ 3 - 3
package/collectd/Config.in

@@ -725,7 +725,7 @@ config BR2_PACKAGE_COLLECTD_RIEMANN
 	bool "riemann"
 	bool "riemann"
 	# riemann-c-client -> protobuf-c
 	# riemann-c-client -> protobuf-c
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS
 	select BR2_PACKAGE_RIEMANN_C_CLIENT
 	select BR2_PACKAGE_RIEMANN_C_CLIENT
 	select BR2_PACKAGE_LIBTOOL
 	select BR2_PACKAGE_LIBTOOL
 	help
 	help
@@ -759,7 +759,7 @@ config BR2_PACKAGE_COLLECTD_WRITELOG
 config BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS
 config BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS
 	bool "write_prometheus"
 	bool "write_prometheus"
 	depends on BR2_INSTALL_LIBSTDCPP # protobuf-c
 	depends on BR2_INSTALL_LIBSTDCPP # protobuf-c
-	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # protobuf-c
+	depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c
 	select BR2_PACKAGE_LIBMICROHTTPD
 	select BR2_PACKAGE_LIBMICROHTTPD
 	select BR2_PACKAGE_PROTOBUF_C
 	select BR2_PACKAGE_PROTOBUF_C
 	help
 	help
@@ -768,7 +768,7 @@ config BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS
 
 
 comment "write_prometheus needs a toolchain w/ C++"
 comment "write_prometheus needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
 	depends on !BR2_INSTALL_LIBSTDCPP
-	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS
 
 
 config BR2_PACKAGE_COLLECTD_WRITEREDIS
 config BR2_PACKAGE_COLLECTD_WRITEREDIS
 	bool "write_redis"
 	bool "write_redis"

+ 2 - 2
package/kismet/Config.in

@@ -3,14 +3,14 @@ comment "kismet needs a toolchain w/ threads, C++, gcc >= 5"
 	depends on !BR2_INSTALL_LIBSTDCPP || \
 	depends on !BR2_INSTALL_LIBSTDCPP || \
 		!BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_TOOLCHAIN_GCC_AT_LEAST_5
 		!BR2_TOOLCHAIN_GCC_AT_LEAST_5
-	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS
 
 
 config BR2_PACKAGE_KISMET
 config BR2_PACKAGE_KISMET
 	bool "kismet"
 	bool "kismet"
 	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_USE_MMU # fork()
 	depends on BR2_USE_MMU # fork()
-	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # protobuf-c
+	depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_PROTOBUF_C
 	select BR2_PACKAGE_PROTOBUF_C

+ 2 - 2
package/protobuf-c/Config.in

@@ -3,7 +3,7 @@ config BR2_PACKAGE_PROTOBUF_C
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	# host-protobuf only builds on certain architectures
 	# host-protobuf only builds on certain architectures
-	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS
 	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++).
@@ -12,4 +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"
+	depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS

+ 15 - 1
package/protobuf/Config.in

@@ -14,6 +14,20 @@
 # and we can live with requiring gcc 4.8 on PowerPC to build protobuf.
 # and we can live with requiring gcc 4.8 on PowerPC to build protobuf.
 #
 #
 # host-protobuf only builds on certain architectures
 # host-protobuf only builds on certain architectures
+config BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS
+	bool
+	default y if BR2_HOSTARCH = "aarch64"
+	default y if BR2_HOSTARCH = "arm"
+	default y if BR2_HOSTARCH = "mips"
+	default y if BR2_HOSTARCH = "mipsel"
+	default y if BR2_HOSTARCH = "powerpc"
+	default y if BR2_HOSTARCH = "powerpc64"
+	default y if BR2_HOSTARCH = "powerpc64le"
+	default y if BR2_HOSTARCH = "sparc"
+	default y if BR2_HOSTARCH = "sparc64"
+	default y if BR2_HOSTARCH = "x86"
+	default y if BR2_HOSTARCH = "x86_64"
+
 config BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
 config BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
 	bool
 	bool
 	default y if BR2_arm
 	default y if BR2_arm
@@ -22,7 +36,7 @@ config BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
 	default y if BR2_x86_64
 	default y if BR2_x86_64
 	default y if BR2_sparc64
 	default y if BR2_sparc64
 	default y if BR2_TOOLCHAIN_HAS_ATOMIC
 	default y if BR2_TOOLCHAIN_HAS_ATOMIC
-	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_USE_MMU # fork()
 
 
 config BR2_PACKAGE_PROTOBUF
 config BR2_PACKAGE_PROTOBUF

+ 1 - 1
package/python-protobuf/Config.in

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

+ 2 - 2
package/riemann-c-client/Config.in

@@ -2,7 +2,7 @@ config BR2_PACKAGE_RIEMANN_C_CLIENT
 	bool "riemann-c-client"
 	bool "riemann-c-client"
 	depends on BR2_INSTALL_LIBSTDCPP # protobuf-c
 	depends on BR2_INSTALL_LIBSTDCPP # protobuf-c
 	depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf-c
 	depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf-c
-	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # protobuf-c
+	depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c
 	select BR2_PACKAGE_PROTOBUF_C
 	select BR2_PACKAGE_PROTOBUF_C
 	help
 	help
 	  Riemann-c-client is a C client library for the Riemann
 	  Riemann-c-client is a C client library for the Riemann
@@ -14,4 +14,4 @@ config BR2_PACKAGE_RIEMANN_C_CLIENT
 
 
 comment "riemann-c-client needs a toolchain w/ C++, threads"
 comment "riemann-c-client 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"
+	depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS