mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-13 13:56:00 +01:00
python3-grpcio: upgrade 1.47.0 -> 1.48.0
0001-absl-always-use-asm-sgidefs.h.patch removed since it's included in 1.48.0 abseil-ppc-fixes.patch refreshed for new version License-Update: Add the contents of Mozilla Public License to license file. Signed-off-by: Xu Huan <xuhuan.fnst@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Xu Huan
Khem Raj
parent
81fedc5a67
commit
d98d8dc8a6
|
|
@ -1,33 +0,0 @@
|
|||
From 8f21fdfb83b0fa844a9f1f03a86a9ca46642d85e Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 9 Apr 2020 13:06:27 -0700
|
||||
Subject: [PATCH 1/2] absl: always use <asm/sgidefs.h>
|
||||
|
||||
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 <raj.khem@gmail.com>
|
||||
---
|
||||
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 <asm/sgidefs.h>
|
||||
-#else
|
||||
-#include <sgidefs.h>
|
||||
-#endif // __BIONIC__
|
||||
#endif // __mips__
|
||||
|
||||
// SYS_mmap and SYS_munmap are not defined in Android.
|
||||
|
|
@ -8,7 +8,16 @@ An all-in-one patch that fixes several issues:
|
|||
Sourced from void linux
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Signed-off-by: Xu Huan <xuhuan.fnst@fujitsu.com>
|
||||
---
|
||||
absl/base/internal/unscaledcycleclock.cc | 4 ++--
|
||||
absl/base/internal/unscaledcycleclock.h | 3 ++-
|
||||
absl/debugging/internal/examine_stack.cc | 8 +++++++-
|
||||
absl/debugging/internal/stacktrace_config.h | 2 +-
|
||||
4 files changed, 12 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc
|
||||
index b1c396c..d62bfd6 100644
|
||||
--- a/absl/base/internal/unscaledcycleclock.cc
|
||||
+++ b/absl/base/internal/unscaledcycleclock.cc
|
||||
@@ -20,7 +20,7 @@
|
||||
|
|
@ -20,7 +29,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|||
#ifdef __GLIBC__
|
||||
#include <sys/platform/ppc.h>
|
||||
#elif defined(__FreeBSD__)
|
||||
@@ -59,7 +59,7 @@ double UnscaledCycleClock::Frequency() {
|
||||
@@ -58,7 +58,7 @@ double UnscaledCycleClock::Frequency() {
|
||||
return base_internal::NominalCPUFrequency();
|
||||
}
|
||||
|
||||
|
|
@ -29,6 +38,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|||
|
||||
int64_t UnscaledCycleClock::Now() {
|
||||
#ifdef __GLIBC__
|
||||
diff --git a/absl/base/internal/unscaledcycleclock.h b/absl/base/internal/unscaledcycleclock.h
|
||||
index 2cbeae3..683a5ef 100644
|
||||
--- a/absl/base/internal/unscaledcycleclock.h
|
||||
+++ b/absl/base/internal/unscaledcycleclock.h
|
||||
@@ -46,7 +46,8 @@
|
||||
|
|
@ -38,12 +49,14 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|||
- defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \
|
||||
+ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
|
||||
+ defined(__riscv) || \
|
||||
defined(_M_IX86) || defined(_M_X64)
|
||||
defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
|
||||
#define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
|
||||
#else
|
||||
diff --git a/absl/debugging/internal/examine_stack.cc b/absl/debugging/internal/examine_stack.cc
|
||||
index 5bdd341..a784e0d 100644
|
||||
--- a/absl/debugging/internal/examine_stack.cc
|
||||
+++ b/absl/debugging/internal/examine_stack.cc
|
||||
@@ -27,6 +27,10 @@
|
||||
@@ -33,6 +33,10 @@
|
||||
#include <csignal>
|
||||
#include <cstdio>
|
||||
|
||||
|
|
@ -54,7 +67,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|||
#include "absl/base/attributes.h"
|
||||
#include "absl/base/internal/raw_logging.h"
|
||||
#include "absl/base/macros.h"
|
||||
@@ -63,8 +67,10 @@ void* GetProgramCounter(void* vuc) {
|
||||
@@ -174,8 +178,10 @@ void* GetProgramCounter(void* const vuc) {
|
||||
return reinterpret_cast<void*>(context->uc_mcontext.pc);
|
||||
#elif defined(__powerpc64__)
|
||||
return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
|
||||
|
|
@ -66,9 +79,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|||
#elif defined(__riscv)
|
||||
return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]);
|
||||
#elif defined(__s390__) && !defined(__s390x__)
|
||||
diff --git a/absl/debugging/internal/stacktrace_config.h b/absl/debugging/internal/stacktrace_config.h
|
||||
index 3929b1b..23d5e50 100644
|
||||
--- a/absl/debugging/internal/stacktrace_config.h
|
||||
+++ b/absl/debugging/internal/stacktrace_config.h
|
||||
@@ -59,7 +59,7 @@
|
||||
@@ -60,7 +60,7 @@
|
||||
#elif defined(__i386__) || defined(__x86_64__)
|
||||
#define ABSL_STACKTRACE_INL_HEADER \
|
||||
"absl/debugging/internal/stacktrace_x86-inl.inc"
|
||||
|
|
@ -77,3 +92,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|||
#define ABSL_STACKTRACE_INL_HEADER \
|
||||
"absl/debugging/internal/stacktrace_powerpc-inl.inc"
|
||||
#elif defined(__aarch64__)
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ DESCRIPTION = "Google gRPC"
|
|||
HOMEPAGE = "http://www.grpc.io/"
|
||||
SECTION = "devel/python"
|
||||
LICENSE = "Apache-2.0 & BSD-3-Clause"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=6e4cf218112648d22420a84281b68b88"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906"
|
||||
|
||||
DEPENDS += "${PYTHON_PN}-protobuf"
|
||||
|
||||
|
|
@ -10,10 +10,9 @@ 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://boring_ssl.patch \
|
||||
file://mips_bigendian.patch \
|
||||
file://0001-absl-always-use-asm-sgidefs.h.patch \
|
||||
file://abseil-ppc-fixes.patch;patchdir=third_party/abseil-cpp \
|
||||
"
|
||||
SRC_URI[sha256sum] = "5dbba95fab9b35957b4977b8904fc1fa56b302f9051eff4d7716ebb0c087f801"
|
||||
SRC_URI[sha256sum] = "eaf4bb73819863440727195411ab3b5c304f6663625e66f348e91ebe0a039306"
|
||||
|
||||
RDEPENDS:${PN} = "${PYTHON_PN}-protobuf \
|
||||
${PYTHON_PN}-setuptools \
|
||||
Loading…
Reference in New Issue
Block a user