diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-07-27 00:04:10 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-08-08 10:04:23 -0700 |
commit | cac734087e3c86a4f788c806bc07417f22bdacb9 (patch) | |
tree | 7203563596abeee787ec06aa6c1ea094b5f89ed8 /meta-networking/recipes-devtools/grpc/grpc/0001-Define-gettid-only-for-glibc-2.30.patch | |
parent | 381508f909a1279a42dfb6e7a12a9da06a752312 (diff) | |
download | meta-openembedded-contrib-cac734087e3c86a4f788c806bc07417f22bdacb9.tar.gz |
grpc: Update to 1.22.0
Fix build with glibc 2.30
Forward port patches
Add versioiniing to grpcpp_channelz plugin
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-devtools/grpc/grpc/0001-Define-gettid-only-for-glibc-2.30.patch')
-rw-r--r-- | meta-networking/recipes-devtools/grpc/grpc/0001-Define-gettid-only-for-glibc-2.30.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/meta-networking/recipes-devtools/grpc/grpc/0001-Define-gettid-only-for-glibc-2.30.patch b/meta-networking/recipes-devtools/grpc/grpc/0001-Define-gettid-only-for-glibc-2.30.patch new file mode 100644 index 0000000000..c6afff2d23 --- /dev/null +++ b/meta-networking/recipes-devtools/grpc/grpc/0001-Define-gettid-only-for-glibc-2.30.patch @@ -0,0 +1,53 @@ +From c27261a8bc1e45ff7d7a585c79b2b871d47217e4 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 26 Jul 2019 18:56:26 -0700 +Subject: [PATCH] Define gettid() only for glibc < 2.30 + +glibc 2.30 has added this API, so let us use that when possible + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/core/lib/gpr/log_linux.cc | 4 ++++ + src/core/lib/iomgr/ev_epollex_linux.cc | 7 +++++-- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc +index 561276f0c2..25a74864a1 100644 +--- a/src/core/lib/gpr/log_linux.cc ++++ b/src/core/lib/gpr/log_linux.cc +@@ -40,7 +40,11 @@ + #include <time.h> + #include <unistd.h> + ++#if defined(__GLIBC__) && (__GLIBC_MINOR__ >= 29) ++#include <unistd.h> ++#else + static long gettid(void) { return syscall(__NR_gettid); } ++#endif + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { +diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc +index 08116b3ab5..d3d3025111 100644 +--- a/src/core/lib/iomgr/ev_epollex_linux.cc ++++ b/src/core/lib/iomgr/ev_epollex_linux.cc +@@ -1101,10 +1101,13 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, + gpr_atm_no_barrier_fetch_add(&pollset->worker_count, -1); + } + +-#ifndef NDEBUG ++#if !defined(DEBUG) ++#if defined(__GLIBC__) && (__GLIBC_MINOR__ >= 29) ++#include <unistd.h> ++#else + static long gettid(void) { return syscall(__NR_gettid); } + #endif +- ++#endif + /* pollset->mu lock must be held by the caller before calling this. + The function pollset_work() may temporarily release the lock (pollset->po.mu) + during the course of its execution but it will always re-acquire the lock and +-- +2.22.0 + |