Add patch to fix gRPC compilation issue with gcc-9.2.1-31 (#319)

Add patch to fix gRPC compilation issue with gcc-9.2.1-31

(cherry picked from commit a2b6565)

Author: pau-baiget

tools/build/rules/repository.bzl

@@ -71,6 +71,7 @@ def _github_repository_impl(ctx):
     stripPrefix = args.strip_prefix,
     sha256 = ctx.attr.sha256,
   )
+  _apply_patch(ctx)
   _add_build_file(ctx)
 
 _github_repository = repository_rule(
@@ -81,6 +82,7 @@ _github_repository = repository_rule(
         branch = attr.string(),
         commit = attr.string(),
         sha256 = attr.string(),
+        patch_file = attr.string(),
     ),
 )
 
@@ -112,6 +114,20 @@ def maybe_repository(repo_rule, name, locals, **kwargs):
             build_file = build_file
         )
 
+def _apply_patch(ctx):
+  if ctx.attr.patch_file:
+    ctx.symlink(Label(ctx.attr.patch_file), "patch_to_repository.patch")
+    cmd = "cd \"{}\" && /usr/bin/patch -p1 -i patch_to_repository.patch".format(ctx.path("."))
+    print("Applying patch: " + cmd)
+    bash_exe = "bash"
+    if ctx.os.name.startswith("windows"):
+      bash_exe = ctx.os.environ["BAZEL_SH"] if "BAZEL_SH" in ctx.os.environ else "c:/tools/msys64/usr/bin/bash.exe"
+    result = ctx.execute([bash_exe, "--login", "-c", cmd])
+    if result.return_code:
+        fail("Failed to apply patch: (%d)\n%s" % (result.return_code, result.stderr))
+    else:
+        print("Patch applied successfully")
+
 # This is *not* a complete maven implementation, it's just good enough for our rules.
 
 _MAVEN_URL = "https://repo.maven.apache.org/maven2"

tools/build/third_party/com_github_grpc_grpc/BUILD.bazel

@@ -0,0 +1,15 @@
+# Copyright (C) 2020 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Empty build file to make this directory a bazel package.

tools/build/third_party/com_github_grpc_grpc/com_github_grpc_grpc_fix.patch

@@ -0,0 +1,61 @@
+From f4f551a3fbb18ff2dc49940fe31a2ee115c9a302 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
+
+---
+ src/core/lib/gpr/log_linux.cc          | 6 ++++--
+ src/core/lib/iomgr/ev_epollex_linux.cc | 6 ++++--
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc
+index 561276f0c2..81026e5689 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 compiled 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, '/');
+diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc
+index c2d80c08dd..991c061219 100644
+--- a/src/core/lib/iomgr/ev_epollex_linux.cc
++++ b/src/core/lib/iomgr/ev_epollex_linux.cc
+@@ -1077,7 +1077,9 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker,
+ }
+ 
+ #ifndef NDEBUG
+-static long gettid(void) { return syscall(__NR_gettid); }
++// Not naming it as gettid() to avoid duplicate declarations when compiled with
++// GCC 9.1.
++static long local_gettid(void) { return syscall(__NR_gettid); }
+ #endif
+ 
+ /* pollset->mu lock must be held by the caller before calling this.
+@@ -1097,7 +1099,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset,
+ #define WORKER_PTR (&worker)
+ #endif
+ #ifndef NDEBUG
+-  WORKER_PTR->originator = gettid();
++  WORKER_PTR->originator = local_gettid();
+ #endif
+   if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) {
+     gpr_log(GPR_INFO,
+-- 
+2.27.0.rc2.251.g90737beb825-goog
+

tools/build/workspace.bzl

@@ -72,6 +72,18 @@ def gapid_dependencies(android = True, mingw = True, locals = {}):
         # v1.20.1
         commit = "7741e806a213cba63c96234f16d712a8aa101a49",
         sha256 = "9ed7d944d8d07deac365c9edcda10ce8159c1436119e1b0792a1e830cb20606c",
+        # This patch works around a naming conflict in grpc which leads to
+        # compilation issues in recent gcc/glibc. This issue is fixed on recent
+        # grpc versions (since
+        # https://github.com/grpc/grpc/commit/de6255941a5e1c2fb2d50e57f84e38c09f45023d),
+        # but updating our grpc version leads to errors in compiling the abseil
+        # dependency of grpc
+        # (https://github.com/abseil/abseil-cpp/issues/326). We tried to pull
+        # abseil ourselves and patch it, but abseil also fails to compile with
+        # gcc on windows, so we choose to patch grpc directly. Once grpc has a
+        # version that builds fine on all our targets, we can update grpc and
+        # drop this patch.
+        patch_file = "@gapid//tools/build/third_party/com_github_grpc_grpc:com_github_grpc_grpc_fix.patch",
     )
     _grpc_deps(locals)