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 --- meta-python/recipes-devtools/python/python-grpcio.inc | 6 ++++-- ...01-setup.py-Do-not-mix-C-and-C-compiler-options.patch | 12 +++++------- .../python/python-grpcio/riscv64_support.patch | 16 ++++++++++++++++ .../recipes-devtools/python/python-grpcio_1.17.1.bb | 6 ------ .../recipes-devtools/python/python-grpcio_1.19.0.bb | 6 ++++++ .../recipes-devtools/python/python3-grpcio_1.17.1.bb | 2 -- .../recipes-devtools/python/python3-grpcio_1.19.0.bb | 2 ++ 7 files changed, 33 insertions(+), 17 deletions(-) create mode 100644 meta-python/recipes-devtools/python/python-grpcio/riscv64_support.patch delete mode 100644 meta-python/recipes-devtools/python/python-grpcio_1.17.1.bb create mode 100644 meta-python/recipes-devtools/python/python-grpcio_1.19.0.bb delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio_1.17.1.bb create mode 100644 meta-python/recipes-devtools/python/python3-grpcio_1.19.0.bb (limited to 'meta-python') diff --git a/meta-python/recipes-devtools/python/python-grpcio.inc b/meta-python/recipes-devtools/python/python-grpcio.inc index 0cef0dda02..fd341f5de7 100644 --- a/meta-python/recipes-devtools/python/python-grpcio.inc +++ b/meta-python/recipes-devtools/python/python-grpcio.inc @@ -8,6 +8,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/python-grpcio:" SRC_URI_append_class-target = " file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \ file://ppc-boringssl-support.patch \ + file://riscv64_support.patch \ " RDEPENDS_${PN} = "${PYTHON_PN}-protobuf \ @@ -19,8 +20,9 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" inherit pypi -SRC_URI[md5sum] = "dd46d7270dfce713c03f45fae999cae3" -SRC_URI[sha256sum] = "fd6774bbb6c717f725b39394757445ead4f69c471118364933aadb81a4f16961" + +SRC_URI[md5sum] = "188565f150f34d1927b87e014f0f4b73" +SRC_URI[sha256sum] = "2ddbca16c2e7b3f2ffc6e34c7cfa6886fb01de9f156ad3f77b72ad652d632097" CLEANBROKEN = "1" 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 diff --git a/meta-python/recipes-devtools/python/python-grpcio_1.17.1.bb b/meta-python/recipes-devtools/python/python-grpcio_1.17.1.bb deleted file mode 100644 index 820bea44b4..0000000000 --- a/meta-python/recipes-devtools/python/python-grpcio_1.17.1.bb +++ /dev/null @@ -1,6 +0,0 @@ -inherit setuptools -require python-grpcio.inc - -RDEPENDS_${PN} += " python-enum34 \ - python-futures \ -" diff --git a/meta-python/recipes-devtools/python/python-grpcio_1.19.0.bb b/meta-python/recipes-devtools/python/python-grpcio_1.19.0.bb new file mode 100644 index 0000000000..820bea44b4 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-grpcio_1.19.0.bb @@ -0,0 +1,6 @@ +inherit setuptools +require python-grpcio.inc + +RDEPENDS_${PN} += " python-enum34 \ + python-futures \ +" diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.17.1.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.17.1.bb deleted file mode 100644 index d4720b4b80..0000000000 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.17.1.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-grpcio.inc diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.19.0.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.19.0.bb new file mode 100644 index 0000000000..d4720b4b80 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.19.0.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-grpcio.inc -- cgit 1.2.3-korg