diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-05-29 00:34:56 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-05-31 07:38:06 -0700 |
commit | b3375a4adc915ba19afd51471613edaa221658c8 (patch) | |
tree | fa3dbc8773388014f10bd8029f1d05c30956c368 /meta-python | |
parent | a603cfc4ddf938841f212782b8dc0cab02139eb7 (diff) | |
download | meta-openembedded-contrib-b3375a4adc915ba19afd51471613edaa221658c8.tar.gz |
python3-grpcio: Update to 1.38.0
Drop riscv patch as its applied upstream
Refresh patches
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
Diffstat (limited to 'meta-python')
-rw-r--r-- | meta-python/recipes-devtools/python/python3-grpcio/mips_bigendian.patch | 2 | ||||
-rw-r--r-- | meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch | 21 | ||||
-rw-r--r-- | meta-python/recipes-devtools/python/python3-grpcio_1.38.0.bb (renamed from meta-python/recipes-devtools/python/python3-grpcio_1.37.0.bb) | 4 |
3 files changed, 2 insertions, 25 deletions
diff --git a/meta-python/recipes-devtools/python/python3-grpcio/mips_bigendian.patch b/meta-python/recipes-devtools/python/python3-grpcio/mips_bigendian.patch index 343f25a46e..775afa415c 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio/mips_bigendian.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio/mips_bigendian.patch @@ -12,4 +12,4 @@ +#elif defined(__mips__) && defined(__LP64__) #define OPENSSL_64_BIT #define OPENSSL_MIPS64 - #elif defined(__riscv) + #elif defined(__riscv) && __SIZEOF_POINTER__ == 8 diff --git a/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch b/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch deleted file mode 100644 index 350c67deaf..0000000000 --- a/meta-python/recipes-devtools/python/python3-grpcio/riscv64_support.patch +++ /dev/null @@ -1,21 +0,0 @@ -Add RISC-V 64bit support - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/third_party/boringssl-with-bazel/src/include/openssl/base.h -+++ b/third_party/boringssl-with-bazel/src/include/openssl/base.h -@@ -108,6 +108,14 @@ extern "C" { - #elif defined(__MIPSEL__) && defined(__LP64__) - #define OPENSSL_64_BIT - #define OPENSSL_MIPS64 -+#elif defined(__riscv) -+# if (__riscv_xlen == 64) -+# define OPENSSL_64_BIT -+# define OPENSSL_RISCV64 -+# elif(__riscv_xlen == 32) -+# define OPENSSL_32_BIT -+# define OPENSSL_RISCV32 -+# endif - #elif defined(__pnacl__) - #define OPENSSL_32_BIT - #define OPENSSL_PNACL diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.37.0.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.38.0.bb index 47fb71120d..d9e00422bc 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.37.0.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.38.0.bb @@ -8,12 +8,11 @@ DEPENDS += "${PYTHON_PN}-protobuf" SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch" SRC_URI_append_class-target = " file://ppc-boringssl-support.patch \ - file://riscv64_support.patch \ file://boring_ssl.patch \ file://mips_bigendian.patch \ file://0001-absl-always-use-asm-sgidefs.h.patch \ " -SRC_URI[sha256sum] = "b3ce16aa91569760fdabd77ca901b2288152eb16941d28edd9a3a75a0c4a8a85" +SRC_URI[sha256sum] = "abbf9c8c3df4d5233d5888c6cfa85c1bb68a6923749bd4dd1abc6e1e93986f17" RDEPENDS_${PN} = "${PYTHON_PN}-protobuf \ ${PYTHON_PN}-setuptools \ @@ -46,4 +45,3 @@ CCACHE_DISABLE = "1" # needs vdso support COMPATIBLE_HOST_libc-musl_powerpc64le = "null" - |