From e16dbc4ca18d06832e80920c7e57cfbe024e4ff3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 5 Mar 2019 19:21:15 -0800 Subject: python-grpcio: Upgrade to 1.19.0 Refresh patch to apply cleanly Fix build for RISC-V Signed-off-by: Khem Raj --- ...01-setup.py-Do-not-mix-C-and-C-compiler-options.patch | 12 +++++------- .../python/python-grpcio/riscv64_support.patch | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 meta-python/recipes-devtools/python/python-grpcio/riscv64_support.patch (limited to 'meta-python/recipes-devtools/python/python-grpcio') diff --git a/meta-python/recipes-devtools/python/python-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch b/meta-python/recipes-devtools/python/python-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch index 996597b146..f17f048de8 100644 --- a/meta-python/recipes-devtools/python/python-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch +++ b/meta-python/recipes-devtools/python/python-grpcio/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch @@ -18,11 +18,9 @@ Signed-off-by: Khem Raj setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: grpcio-1.14.1/setup.py -=================================================================== ---- grpcio-1.14.1.orig/setup.py -+++ grpcio-1.14.1/setup.py -@@ -123,7 +123,7 @@ ENABLE_DOCUMENTATION_BUILD = os.environ. +--- a/setup.py ++++ b/setup.py +@@ -145,7 +145,7 @@ ENABLE_DOCUMENTATION_BUILD = os.environ. EXTRA_ENV_COMPILE_ARGS = os.environ.get('GRPC_PYTHON_CFLAGS', None) EXTRA_ENV_LINK_ARGS = os.environ.get('GRPC_PYTHON_LDFLAGS', None) if EXTRA_ENV_COMPILE_ARGS is None: @@ -31,7 +29,7 @@ Index: grpcio-1.14.1/setup.py if 'win32' in sys.platform and sys.version_info < (3, 5): EXTRA_ENV_COMPILE_ARGS += ' -D_hypot=hypot' # We use define flags here and don't directly add to DEFINE_MACROS below to -@@ -135,7 +135,7 @@ if EXTRA_ENV_COMPILE_ARGS is None: +@@ -157,7 +157,7 @@ if EXTRA_ENV_COMPILE_ARGS is None: else: EXTRA_ENV_COMPILE_ARGS += ' -D_ftime=_ftime64 -D_timeb=__timeb64' elif "linux" in sys.platform: @@ -39,4 +37,4 @@ Index: grpcio-1.14.1/setup.py + EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv -fno-exceptions' elif "darwin" in sys.platform: EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv -fno-exceptions' - EXTRA_ENV_COMPILE_ARGS += ' -DPB_FIELD_16BIT' + EXTRA_ENV_COMPILE_ARGS += ' -DPB_FIELD_32BIT' diff --git a/meta-python/recipes-devtools/python/python-grpcio/riscv64_support.patch b/meta-python/recipes-devtools/python/python-grpcio/riscv64_support.patch new file mode 100644 index 0000000000..fef7d9e757 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-grpcio/riscv64_support.patch @@ -0,0 +1,16 @@ +Add RISC-V 64bit support + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- a/third_party/boringssl/include/openssl/base.h ++++ b/third_party/boringssl/include/openssl/base.h +@@ -104,6 +104,9 @@ extern "C" { + #elif defined(__mips__) && defined(__LP64__) + #define OPENSSL_64_BIT + #define OPENSSL_MIPS64 ++#elif defined(__riscv) && defined(__riscv_xlen) ++#define OPENSSL_64_BIT ++#define OPENSSL_RISCV64 + #elif defined(__pnacl__) + #define OPENSSL_32_BIT + #define OPENSSL_PNACL -- cgit v1.2.3-54-g00ecf