mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-01-06 17:27:31 +01:00
python3-grpcio: upgrade 1.67.1 -> 1.68.1
port_def.inc abseil-ppc-fixes.patch refreshed for 1.68.1 0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch removed since it's included in 1.68.1 Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Wang Mingyu
Khem Raj
parent
0dc567b416
commit
984b0d993f
|
|
@ -1,4 +1,4 @@
|
|||
From 028a02fa7f03a3bcd590624d32b09100129e096a Mon Sep 17 00:00:00 2001
|
||||
From 7d2d5d39b7dcf9b6336d78b9e977b0550f7afe9e Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 16 Sep 2022 19:09:15 -0700
|
||||
Subject: [PATCH] protobuf: Disable musttail attribute on mips
|
||||
|
|
@ -13,10 +13,10 @@ Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
|
|||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/third_party/protobuf/src/google/protobuf/port_def.inc b/third_party/protobuf/src/google/protobuf/port_def.inc
|
||||
index 2b13718..8875e3e 100644
|
||||
index 37d80e5..c136654 100644
|
||||
--- a/third_party/protobuf/src/google/protobuf/port_def.inc
|
||||
+++ b/third_party/protobuf/src/google/protobuf/port_def.inc
|
||||
@@ -242,6 +242,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
|
||||
@@ -222,6 +222,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
|
||||
#error PROTOBUF_TAILCALL was previously defined
|
||||
#endif
|
||||
#if ABSL_HAVE_CPP_ATTRIBUTE(clang::musttail) && !defined(__arm__) && \
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ DEPENDS += "python3-grpcio"
|
|||
SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \
|
||||
file://0001-protobuf-Disable-musttail-attribute-on-mips.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "d9657f5ddc62b52f58904e6054b7d8a8909ed08a1e28b734be3a707087bcf004"
|
||||
SRC_URI[sha256sum] = "2413a17ad16c9c821b36e4a67fc64c37b9e4636ab1c3a07778018801378739ba"
|
||||
|
||||
RDEPENDS:${PN} = "python3-grpcio"
|
||||
|
||||
|
|
@ -1,79 +0,0 @@
|
|||
From ee0e37b02d0d28279e103653688bf7203275ec47 Mon Sep 17 00:00:00 2001
|
||||
From: aurel32 <aurelien@aurel32.net>
|
||||
Date: Fri, 22 Mar 2024 14:21:13 -0700
|
||||
Subject: [PATCH] PR #1644: unscaledcycleclock: remove RISC-V support
|
||||
|
||||
Imported from GitHub PR https://github.com/abseil/abseil-cpp/pull/1644
|
||||
|
||||
Starting with Linux 6.6 [1], RDCYCLE is a privileged instruction on RISC-V and can't be used directly from userland. There is a sysctl option to change that as a transition period, but it will eventually disappear.
|
||||
|
||||
The RDTIME instruction is another less accurate alternative, however its frequency varies from board to board, and there is currently now way to get its frequency from userland [2].
|
||||
|
||||
Therefore this patch just removes the code for unscaledcycleclock on RISC-V. Without processor specific implementation, abseil relies on std::chrono::steady_clock::now().time_since_epoch() which is basically a wrapper around clock_gettime (CLOCK_MONOTONIC), which in turns use __vdso_clock_gettime(). On RISC-V this VDSO is just a wrapper around RDTIME correctly scaled to use nanoseconds units.
|
||||
|
||||
This fixes the testsuite on riscv64, tested on a VisionFive 2 board.
|
||||
|
||||
[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cc4c07c89aada16229084eeb93895c95b7eabaa3
|
||||
[2] https://github.com/abseil/abseil-cpp/pull/1631
|
||||
Merge 43356a2548cfde76e164d446cb69004b488c6a71 into 76f8011beabdaee872b5fde7546e02407b220cb1
|
||||
|
||||
Merging this change closes #1644
|
||||
|
||||
COPYBARA_INTEGRATE_REVIEW=https://github.com/abseil/abseil-cpp/pull/1644 from aurel32:rv64-no-unscaledcycleclock 43356a2548cfde76e164d446cb69004b488c6a71
|
||||
PiperOrigin-RevId: 618286262
|
||||
Change-Id: Ie4120a727e7d0bb185df6e06ea145c780ebe6652
|
||||
|
||||
Upstream-Status: Backport [https://github.com/abseil/abseil-cpp/commit/7335a36d]
|
||||
[Adapted to apply on top of meta-oe's patch stack]
|
||||
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
|
||||
---
|
||||
.../absl/base/internal/unscaledcycleclock.cc | 12 ------------
|
||||
.../absl/base/internal/unscaledcycleclock_config.h | 5 ++---
|
||||
2 files changed, 2 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
|
||||
index f11fecb..103b4f6 100644
|
||||
--- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
|
||||
+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
|
||||
@@ -121,18 +121,6 @@ double UnscaledCycleClock::Frequency() {
|
||||
return aarch64_timer_frequency;
|
||||
}
|
||||
|
||||
-#elif defined(__riscv)
|
||||
-
|
||||
-int64_t UnscaledCycleClock::Now() {
|
||||
- int64_t virtual_timer_value;
|
||||
- asm volatile("rdcycle %0" : "=r"(virtual_timer_value));
|
||||
- return virtual_timer_value;
|
||||
-}
|
||||
-
|
||||
-double UnscaledCycleClock::Frequency() {
|
||||
- return base_internal::NominalCPUFrequency();
|
||||
-}
|
||||
-
|
||||
#elif defined(_M_IX86) || defined(_M_X64)
|
||||
|
||||
#pragma intrinsic(__rdtsc)
|
||||
diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
|
||||
index 5e232c1..83552fc 100644
|
||||
--- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
|
||||
+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
|
||||
@@ -22,7 +22,6 @@
|
||||
// The following platforms have an implementation of a hardware counter.
|
||||
#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
|
||||
((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
|
||||
- defined(__riscv) || \
|
||||
defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
|
||||
#define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
|
||||
#else
|
||||
@@ -54,8 +53,8 @@
|
||||
#if ABSL_USE_UNSCALED_CYCLECLOCK
|
||||
// This macro can be used to test if UnscaledCycleClock::Frequency()
|
||||
// is NominalCPUFrequency() on a particular platform.
|
||||
-#if (defined(__i386__) || defined(__x86_64__) || defined(__riscv) || \
|
||||
- defined(_M_IX86) || defined(_M_X64))
|
||||
+#if (defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || \
|
||||
+ defined(_M_X64))
|
||||
#define ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY
|
||||
#endif
|
||||
#endif
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
From a2ec96a96ff7ba016e800212a942b9f29f255415 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 13 Mar 2021 10:26:25 -0800
|
||||
Subject: [PATCH] An all-in-one patch that fixes several issues:
|
||||
|
||||
|
|
@ -13,6 +13,7 @@ Sourced from void linux
|
|||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Signed-off-by: Xu Huan <xuhuan.fnst@fujitsu.com>
|
||||
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
|
||||
---
|
||||
.../abseil-cpp/absl/base/internal/unscaledcycleclock.cc | 4 ++--
|
||||
.../absl/base/internal/unscaledcycleclock_config.h | 3 ++-
|
||||
|
|
@ -21,7 +22,7 @@ Signed-off-by: Xu Huan <xuhuan.fnst@fujitsu.com>
|
|||
4 files changed, 12 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
|
||||
index 05e0e7b..f11fecb 100644
|
||||
index a0bf3a6..103b4f6 100644
|
||||
--- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
|
||||
+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc
|
||||
@@ -20,7 +20,7 @@
|
||||
|
|
@ -43,17 +44,17 @@ index 05e0e7b..f11fecb 100644
|
|||
int64_t UnscaledCycleClock::Now() {
|
||||
#ifdef __GLIBC__
|
||||
diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
|
||||
index 24b324a..5e232c1 100644
|
||||
index 43a3dab..196a853 100644
|
||||
--- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
|
||||
+++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
|
||||
@@ -21,7 +21,8 @@
|
||||
|
||||
// The following platforms have an implementation of a hardware counter.
|
||||
#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
|
||||
- defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \
|
||||
- defined(__powerpc__) || defined(__ppc__) || defined(_M_IX86) || \
|
||||
+ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
|
||||
+ defined(__riscv) || \
|
||||
defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
|
||||
+ defined(_M_IX86) || \
|
||||
(defined(_M_X64) && !defined(_M_ARM64EC))
|
||||
#define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
|
||||
#else
|
||||
diff --git a/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc b/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
|
||||
|
|
@ -96,3 +97,6 @@ index 3929b1b..23d5e50 100644
|
|||
#define ABSL_STACKTRACE_INL_HEADER \
|
||||
"absl/debugging/internal/stacktrace_powerpc-inl.inc"
|
||||
#elif defined(__aarch64__)
|
||||
--
|
||||
2.43.0
|
||||
|
||||
|
|
|
|||
|
|
@ -11,9 +11,8 @@ SRC_URI += "file://0001-Include-missing-cstdint-header.patch \
|
|||
file://0001-zlib-Include-unistd.h-for-open-close-C-APIs.patch \
|
||||
file://0001-crypto-use-_Generic-only-if-defined-__cplusplus.patch;patchdir=third_party/boringssl-with-bazel/src/ \
|
||||
file://0001-target.h-define-proper-macro-for-ppc-ppc64.patch \
|
||||
file://0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "3dc2ed4cabea4dc14d5e708c2b426205956077cc5de419b4d4079315017e9732"
|
||||
SRC_URI[sha256sum] = "44a8502dd5de653ae6a73e2de50a401d84184f0331d0ac3daeb044e66d5c5054"
|
||||
|
||||
RDEPENDS:${PN} = "python3-protobuf"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user