From 76803697fbcc18e0e02c7c5e514e398e37c4e1f7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 3 Mar 2021 20:40:51 -0800 Subject: python3-grpcio: Fix build on mips and musl Signed-off-by: Khem Raj Acked-by: Trevor Gamblin --- .../0001-absl-always-use-asm-sgidefs.h.patch | 33 ++++++++++++++++++++++ .../python/python3-grpcio/mips_bigendian.patch | 15 ++++++++++ 2 files changed, 48 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-grpcio/0001-absl-always-use-asm-sgidefs.h.patch create mode 100644 meta-python/recipes-devtools/python/python3-grpcio/mips_bigendian.patch (limited to 'meta-python/recipes-devtools/python/python3-grpcio') diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-absl-always-use-asm-sgidefs.h.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-absl-always-use-asm-sgidefs.h.patch new file mode 100644 index 0000000000..be516ca508 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-absl-always-use-asm-sgidefs.h.patch @@ -0,0 +1,33 @@ +From 8f21fdfb83b0fa844a9f1f03a86a9ca46642d85e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 9 Apr 2020 13:06:27 -0700 +Subject: [PATCH 1/2] absl: always use + +Fixes mips/musl build, since sgidefs.h is not present on all C libraries +but on linux asm/sgidefs.h is there and contains same definitions, using +that makes it portable. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + third_party/abseil-cpp/absl/base/internal/direct_mmap.h | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +--- a/third_party/abseil-cpp/absl/base/internal/direct_mmap.h ++++ b/third_party/abseil-cpp/absl/base/internal/direct_mmap.h +@@ -41,13 +41,9 @@ + + #ifdef __mips__ + // Include definitions of the ABI currently in use. +-#ifdef __BIONIC__ +-// Android doesn't have sgidefs.h, but does have asm/sgidefs.h, which has the ++// bionic/musl C libs don't have sgidefs.h, but do have asm/sgidefs.h, which has the + // definitions we need. + #include +-#else +-#include +-#endif // __BIONIC__ + #endif // __mips__ + + // SYS_mmap and SYS_munmap are not defined in Android. diff --git a/meta-python/recipes-devtools/python/python3-grpcio/mips_bigendian.patch b/meta-python/recipes-devtools/python/python3-grpcio/mips_bigendian.patch new file mode 100644 index 0000000000..343f25a46e --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-grpcio/mips_bigendian.patch @@ -0,0 +1,15 @@ +--- a/third_party/boringssl-with-bazel/src/include/openssl/base.h ++++ b/third_party/boringssl-with-bazel/src/include/openssl/base.h +@@ -102,10 +102,10 @@ extern "C" { + #elif (defined(__PPC__) || defined(__powerpc__)) + #define OPENSSL_32_BIT + #define OPENSSL_PPC +-#elif defined(__MIPSEL__) && !defined(__LP64__) ++#elif defined(__mips__) && !defined(__LP64__) + #define OPENSSL_32_BIT + #define OPENSSL_MIPS +-#elif defined(__MIPSEL__) && defined(__LP64__) ++#elif defined(__mips__) && defined(__LP64__) + #define OPENSSL_64_BIT + #define OPENSSL_MIPS64 + #elif defined(__riscv) -- cgit 1.2.3-korg