diff mbox series

[1/1] package/python-grpcio: add BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS

Message ID 20240301205037.914259-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [1/1] package/python-grpcio: add BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS | expand

Commit Message

Fabrice Fontaine March 1, 2024, 8:50 p.m. UTC
Fix the following build failure raised since the addition of the package
in commit ea45b95c0e54866134c63e88e60489a012b3d134:

In file included from third_party/boringssl-with-bazel/src/include/openssl/base.h:78,
                 from third_party/boringssl-with-bazel/src/include/openssl/ssl.h:145,
                 from ./src/core/tsi/ssl/key_logging/ssl_key_logging.h:23,
                 from ./src/core/lib/security/security_connector/ssl_utils.h:42,
                 from ./src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h:36,
                 from ./src/core/ext/xds/certificate_provider_store.h:44,
                 from src/core/ext/xds/certificate_provider_store.cc:21:
third_party/boringssl-with-bazel/src/include/openssl/target.h:62:2: error: #error "Unknown target CPU"
   62 | #error "Unknown target CPU"
      |  ^~~~~

Fixes: ea45b95c0e54866134c63e88e60489a012b3d134
 - http://autobuild.buildroot.org/results/36686aca1b45f0bf692a60e67a48424b561930a3
 - http://autobuild.buildroot.org/results/4f79c7b1b2fc3306f300ae3ec0aa4439725814c1

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/python-grpc-requests/Config.in     |  3 +++
 package/python-grpcio-reflection/Config.in |  2 ++
 package/python-grpcio/Config.in            | 11 +++++++++++
 3 files changed, 16 insertions(+)

Comments

Peter Korsgaard March 1, 2024, 9:03 p.m. UTC | #1
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Fix the following build failure raised since the addition of the package
 > in commit ea45b95c0e54866134c63e88e60489a012b3d134:

 > In file included from third_party/boringssl-with-bazel/src/include/openssl/base.h:78,
 >                  from third_party/boringssl-with-bazel/src/include/openssl/ssl.h:145,
 >                  from ./src/core/tsi/ssl/key_logging/ssl_key_logging.h:23,
 >                  from ./src/core/lib/security/security_connector/ssl_utils.h:42,
 >                  from ./src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h:36,
 >                  from ./src/core/ext/xds/certificate_provider_store.h:44,
 >                  from src/core/ext/xds/certificate_provider_store.cc:21:
 > third_party/boringssl-with-bazel/src/include/openssl/target.h:62:2: error: #error "Unknown target CPU"
 >    62 | #error "Unknown target CPU"
 >       |  ^~~~~

 > Fixes: ea45b95c0e54866134c63e88e60489a012b3d134
 >  - http://autobuild.buildroot.org/results/36686aca1b45f0bf692a60e67a48424b561930a3
 >  - http://autobuild.buildroot.org/results/4f79c7b1b2fc3306f300ae3ec0aa4439725814c1

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed, thanks.
diff mbox series

Patch

diff --git a/package/python-grpc-requests/Config.in b/package/python-grpc-requests/Config.in
index 3a2740f0f7..1cdd0d3f67 100644
--- a/package/python-grpc-requests/Config.in
+++ b/package/python-grpc-requests/Config.in
@@ -1,6 +1,7 @@ 
 config BR2_PACKAGE_PYTHON_GRPC_REQUESTS
 	bool "python-grpc-requests"
 	depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography
+	depends on BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS # python-grpcio
 	depends on BR2_INSTALL_LIBSTDCPP # python-grpcio
 	select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime
 	select BR2_PACKAGE_PYTHON_GOOGLE_API_CORE # runtime
@@ -12,4 +13,6 @@  config BR2_PACKAGE_PYTHON_GRPC_REQUESTS
 	  https://github.com/wesky93/grpc_requests
 
 comment "python-grpcio-requests needs a toolchain w/ C++"
+	depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/python-grpcio-reflection/Config.in b/package/python-grpcio-reflection/Config.in
index afe8988165..a0ca35c286 100644
--- a/package/python-grpcio-reflection/Config.in
+++ b/package/python-grpcio-reflection/Config.in
@@ -1,5 +1,6 @@ 
 config BR2_PACKAGE_PYTHON_GRPCIO_REFLECTION
 	bool "python-grpcio-reflection"
+	depends on BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS # python-grpcio
 	depends on BR2_INSTALL_LIBSTDCPP # python-grpcio
 	select BR2_PACKAGE_PYTHON_GRPCIO # runtime
 	select BR2_PACKAGE_PYTHON_PROTOBUF # runtime
@@ -9,4 +10,5 @@  config BR2_PACKAGE_PYTHON_GRPCIO_REFLECTION
 	  https://grpc.io
 
 comment "python-grpcio-reflection needs a toolchain w/ C++"
+	depends on BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/python-grpcio/Config.in b/package/python-grpcio/Config.in
index 5242eb461e..9657ccb6ed 100644
--- a/package/python-grpcio/Config.in
+++ b/package/python-grpcio/Config.in
@@ -1,5 +1,15 @@ 
+config BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS
+	bool
+	# see third_party/boringssl-with-bazel/src/include/openssl/target.h
+	default y if BR2_aarch64 || BR2_aarch64_be
+	default y if BR2_arm || BR2_armeb
+	default y if BR2_i386 || BR2_x86_64
+	default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
+	default y if BR2_riscv
+
 config BR2_PACKAGE_PYTHON_GRPCIO
 	bool "python-grpcio"
+	depends on BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
 	  HTTP/2-based RPC framework.
@@ -7,4 +17,5 @@  config BR2_PACKAGE_PYTHON_GRPCIO
 	  https://grpc.io
 
 comment "python-grpcio needs a toolchain w/ C++"
+	depends on BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS
 	depends on !BR2_INSTALL_LIBSTDCPP