From 252de4f05ccb5703a1d4e8ae473e3b07f5af7f0c Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Fri, 20 Dec 2019 18:01:55 -0800 Subject: [PATCH] Revert "Support CentOS 7 for gRPC.NET" --- CMakeLists.txt | 1 - Makefile | 2 - build.yaml | 1 - grpc.gyp | 1 - src/csharp/ext/std++compat.cc | 46 ------------------- .../artifacts/distribtest_targets.py | 4 +- 6 files changed, 2 insertions(+), 53 deletions(-) delete mode 100644 src/csharp/ext/std++compat.cc diff --git a/CMakeLists.txt b/CMakeLists.txt index cf6258b464c..b6be8766fd3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5855,7 +5855,6 @@ if(gRPC_BUILD_CSHARP_EXT) add_library(grpc_csharp_ext SHARED src/csharp/ext/grpc_csharp_ext.c - src/csharp/ext/std++compat.cc ) set_target_properties(grpc_csharp_ext PROPERTIES diff --git a/Makefile b/Makefile index 7ef9c09b9e1..3522efe847c 100644 --- a/Makefile +++ b/Makefile @@ -8145,7 +8145,6 @@ $(OBJDIR)/$(CONFIG)/test/cpp/qps/usage_timer.o: $(GENDIR)/src/proto/grpc/testing LIBGRPC_CSHARP_EXT_SRC = \ src/csharp/ext/grpc_csharp_ext.c \ - src/csharp/ext/std++compat.cc \ PUBLIC_HEADERS_C += \ @@ -23368,7 +23367,6 @@ src/cpp/server/secure_server_credentials.cc: $(OPENSSL_DEP) src/cpp/util/core_stats.cc: $(OPENSSL_DEP) src/cpp/util/error_details.cc: $(OPENSSL_DEP) src/csharp/ext/grpc_csharp_ext.c: $(OPENSSL_DEP) -src/csharp/ext/std++compat.cc: $(OPENSSL_DEP) test/core/bad_client/bad_client.cc: $(OPENSSL_DEP) test/core/bad_ssl/server_common.cc: $(OPENSSL_DEP) test/core/end2end/data/client_certs.cc: $(OPENSSL_DEP) diff --git a/build.yaml b/build.yaml index accfad1ee20..444a862c39a 100644 --- a/build.yaml +++ b/build.yaml @@ -2258,7 +2258,6 @@ libs: language: csharp src: - src/csharp/ext/grpc_csharp_ext.c - - src/csharp/ext/std++compat.cc deps: - grpc - gpr diff --git a/grpc.gyp b/grpc.gyp index 5caad279cec..3568105522b 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -2309,7 +2309,6 @@ ], 'sources': [ 'src/csharp/ext/grpc_csharp_ext.c', - 'src/csharp/ext/std++compat.cc', ], }, { diff --git a/src/csharp/ext/std++compat.cc b/src/csharp/ext/std++compat.cc deleted file mode 100644 index 1ab3fb21e1d..00000000000 --- a/src/csharp/ext/std++compat.cc +++ /dev/null @@ -1,46 +0,0 @@ -/* - * - * Copyright 2019 gRPC authors. - * - * 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. - * - */ - -#include -#include -#include - -#if defined(__GNUC__) - -namespace std { - -// CentOS 7 (GLIBC_2.17 / GLIBCXX_3.4.19) doesn't have a following symbol -// which was added to GLIBCXX_3.4.20. gRPC uses Debian 8 which has -// GLIBCXX_3.4.20 when building .net artifacts so artifacts can have symbols -// which are not available on CentOS 7. -// To support CentOS 7, missing symbols are provided as weak symbols. -void __attribute__((weak)) __throw_out_of_range_fmt(char const* fmt, ...) { - va_list ap; - char buf[1024]; // That should be big enough. - - va_start(ap, fmt); - vsnprintf(buf, sizeof(buf), fmt, ap); - buf[sizeof(buf) - 1] = 0; - va_end(ap); - - __throw_range_error(buf); -} - -} // namespace std - -#endif // defined(__GNUC__) diff --git a/tools/run_tests/artifacts/distribtest_targets.py b/tools/run_tests/artifacts/distribtest_targets.py index 2b602198b17..337a25acf4f 100644 --- a/tools/run_tests/artifacts/distribtest_targets.py +++ b/tools/run_tests/artifacts/distribtest_targets.py @@ -275,8 +275,8 @@ class CppDistribTest(object): if self.platform == 'linux': return create_docker_jobspec( self.name, - 'tools/dockerfile/distribtest/cpp_%s_%s' % (self.docker_suffix, - self.arch), + 'tools/dockerfile/distribtest/cpp_%s_%s' % + (self.docker_suffix, self.arch), 'test/distrib/cpp/run_distrib_test_%s.sh' % self.testcase, timeout_seconds=45 * 60) elif self.platform == 'windows':