package/grpc: fix build with glibc 2.30
PATCH 1/1 package/grpc: fix build with glibc 2.30
Fixes:
- http://autobuild.buildroot.org/results/42eb63a89228d340cab05c7ab65fab9b02814689
Signed-off-by Fabrice Fontaine <[email protected]>
--- .../0004-Fix-gettid-naming-conflict.patch | 36 ++++++++ .../grpc/0005-Rename-gettid-functions.patch | 83 +++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 package/grpc/0004-Fix-gettid-naming-conflict.patch create mode 100644 package/grpc/0005-Rename-gettid-functions.patch
package/grpc/0004-Fix-gettid-naming-conflict.patch new file +36 -0
@@ -0,0 +1,36 @@ +From de6255941a5e1c2fb2d50e57f84e38c09f45023d Mon Sep 17 00:00:00 2001 +From: Juanli Shen <[email protected]> +Date: Fri, 23 Aug 2019 08:46:09 -0700 +Subject: [PATCH] Fix gettid() naming conflict + +[Retrieved from: +https://github.com/grpc/grpc/commit/de6255941a5e1c2fb2d50e57f84e38c09f45023d] +Signed-off-by: Fabrice Fontaine <[email protected]> +--- + src/core/lib/gpr/log_linux.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc +index 561276f0c20..81026e5689b 100644 +--- a/src/core/lib/gpr/log_linux.cc ++++ b/src/core/lib/gpr/log_linux.cc +@@ -40,7 +40,9 @@ + #include <time.h> + #include <unistd.h> + +-static long gettid(void) { return syscall(__NR_gettid); } ++// Not naming it as gettid() to avoid duplicate declarations when complied with ++// GCC 9.1. ++static long local_gettid(void) { return syscall(__NR_gettid); } + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { +@@ -70,7 +72,7 @@ void gpr_default_log(gpr_log_func_args* args) { + gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); + struct tm tm; + static __thread long tid = 0; +- if (tid == 0) tid = gettid(); ++ if (tid == 0) tid = local_gettid(); + + timer = static_cast<time_t>(now.tv_sec); + final_slash = strrchr(args->file, '/');
package/grpc/0005-Rename-gettid-functions.patch new file +83 -0
83 lines not on this page · raw message
Signature · 1 line
2.23.0.rc1
Thomas Petazzoni
AppliedPATCH 1/1 package/grpc: fix build with glibc 2.30
Quoted 10 lines · On Mon, 16 Sep 2019 18:53:31 +0200 Fabrice Fontaine…
Fixes:
- http://autobuild.buildroot.org/results/42eb63a89228d340cab05c7ab65fab9b02814689Signed-off-by Fabrice Fontaine <[email protected]>--- .../0004-Fix-gettid-naming-conflict.patch | 36 ++++++++ .../grpc/0005-Rename-gettid-functions.patch | 83 +++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 package/grpc/0004-Fix-gettid-naming-conflict.patch create mode 100644 package/grpc/0005-Rename-gettid-functions.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com