From 7227733cbf8792444fe21fac729ab7f7d86a7866 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 23 Dec 2018 10:46:51 -0800 Subject: python-grpcio: Upgrade to 1.17.1 Patch to fix ppc build Signed-off-by: Khem Raj Cc: Tim "moto-timo" Orling Cc: Derek Straka --- meta-python/recipes-devtools/python/python-grpcio.inc | 10 ++++++---- .../python/python-grpcio/ppc-boringssl-support.patch | 17 +++++++++++++++++ .../recipes-devtools/python/python-grpcio_1.14.1.bb | 6 ------ .../recipes-devtools/python/python-grpcio_1.17.1.bb | 6 ++++++ .../recipes-devtools/python/python3-grpcio_1.14.1.bb | 2 -- .../recipes-devtools/python/python3-grpcio_1.17.1.bb | 2 ++ 6 files changed, 31 insertions(+), 12 deletions(-) create mode 100644 meta-python/recipes-devtools/python/python-grpcio/ppc-boringssl-support.patch delete mode 100644 meta-python/recipes-devtools/python/python-grpcio_1.14.1.bb create mode 100644 meta-python/recipes-devtools/python/python-grpcio_1.17.1.bb delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio_1.14.1.bb create mode 100644 meta-python/recipes-devtools/python/python3-grpcio_1.17.1.bb diff --git a/meta-python/recipes-devtools/python/python-grpcio.inc b/meta-python/recipes-devtools/python/python-grpcio.inc index 23d25f7aa5..0cef0dda02 100644 --- a/meta-python/recipes-devtools/python/python-grpcio.inc +++ b/meta-python/recipes-devtools/python/python-grpcio.inc @@ -5,7 +5,10 @@ SECTION = "devel/python" DEPENDS_append = "${PYTHON_PN}-protobuf" FILESEXTRAPATHS_prepend := "${THISDIR}/python-grpcio:" -SRC_URI_append_class-target = " file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch " + +SRC_URI_append_class-target = " file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \ + file://ppc-boringssl-support.patch \ +" RDEPENDS_${PN} = "${PYTHON_PN}-protobuf \ ${PYTHON_PN}-setuptools \ @@ -16,9 +19,8 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" inherit pypi - -SRC_URI[md5sum] = "0987ae2e47b5103de3cacc437874a3c5" -SRC_URI[sha256sum] = "4bf23666e763ca7ff6010465864e9f088f4ac7ecc1e11abd6f85b250e66b2c05" +SRC_URI[md5sum] = "dd46d7270dfce713c03f45fae999cae3" +SRC_URI[sha256sum] = "fd6774bbb6c717f725b39394757445ead4f69c471118364933aadb81a4f16961" CLEANBROKEN = "1" diff --git a/meta-python/recipes-devtools/python/python-grpcio/ppc-boringssl-support.patch b/meta-python/recipes-devtools/python/python-grpcio/ppc-boringssl-support.patch new file mode 100644 index 0000000000..6435abbe6d --- /dev/null +++ b/meta-python/recipes-devtools/python/python-grpcio/ppc-boringssl-support.patch @@ -0,0 +1,17 @@ +Let boringSSL compile on ppc32 bit + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +--- a/third_party/boringssl/include/openssl/base.h ++++ b/third_party/boringssl/include/openssl/base.h +@@ -95,6 +95,9 @@ extern "C" { + #elif (defined(__PPC64__) || defined(__powerpc64__)) && defined(_LITTLE_ENDIAN) + #define OPENSSL_64_BIT + #define OPENSSL_PPC64LE ++#elif (defined(__PPC__) || defined(__powerpc__)) ++#define OPENSSL_32_BIT ++#define OPENSSL_PPC + #elif defined(__mips__) && !defined(__LP64__) + #define OPENSSL_32_BIT + #define OPENSSL_MIPS diff --git a/meta-python/recipes-devtools/python/python-grpcio_1.14.1.bb b/meta-python/recipes-devtools/python/python-grpcio_1.14.1.bb deleted file mode 100644 index 820bea44b4..0000000000 --- a/meta-python/recipes-devtools/python/python-grpcio_1.14.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.17.1.bb b/meta-python/recipes-devtools/python/python-grpcio_1.17.1.bb new file mode 100644 index 0000000000..820bea44b4 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-grpcio_1.17.1.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.14.1.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.14.1.bb deleted file mode 100644 index d4720b4b80..0000000000 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.14.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.17.1.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.17.1.bb new file mode 100644 index 0000000000..d4720b4b80 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.17.1.bb @@ -0,0 +1,2 @@ +inherit setuptools3 +require python-grpcio.inc -- cgit 1.2.3-korg