From b0a63e2d349bf2df2f86a538e08b811bafb1cd1a Mon Sep 17 00:00:00 2001 From: SChernykh <15806605+SChernykh@users.noreply.github.com> Date: Sun, 19 May 2024 23:50:44 +0200 Subject: [PATCH] Update grpc --- .github/workflows/c-cpp.yml | 2 -- external/src/grpc | 2 +- patches/msys2/gcc14_abseil.patch | 13 ------------- 3 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 patches/msys2/gcc14_abseil.patch diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 8b09935..1900f32 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -357,8 +357,6 @@ jobs: run: | cd external/src/grpc/third_party/boringssl-with-bazel git apply --verbose --ignore-whitespace ../../../../../patches/msys2/gcc14_boringssl.patch - cd ../abseil-cpp - git apply --verbose --ignore-whitespace ../../../../../patches/msys2/gcc14_abseil.patch cd / git apply --verbose --ignore-whitespace --directory=mingw64/include/c++/`ls mingw64/include/c++`/ /d/a/p2pool/p2pool/patches/msys2/typeinfo.patch diff --git a/external/src/grpc b/external/src/grpc index 6261853..783e600 160000 --- a/external/src/grpc +++ b/external/src/grpc @@ -1 +1 @@ -Subproject commit 62618530b03e8a5c91e5dbe06d4cfbed1cd65937 +Subproject commit 783e600967a2e3f2d89369860361ded673b1b41c diff --git a/patches/msys2/gcc14_abseil.patch b/patches/msys2/gcc14_abseil.patch deleted file mode 100644 index e9f2e51..0000000 --- a/patches/msys2/gcc14_abseil.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/absl/numeric/internal/bits.h b/absl/numeric/internal/bits.h -index bfef06bc..3091d1b4 100644 ---- a/absl/numeric/internal/bits.h -+++ b/absl/numeric/internal/bits.h -@@ -303,7 +303,7 @@ CountTrailingZeroesNonzero64(uint64_t x) { - - ABSL_ATTRIBUTE_ALWAYS_INLINE ABSL_INTERNAL_CONSTEXPR_CTZ inline int - CountTrailingZeroesNonzero16(uint16_t x) { --#if ABSL_HAVE_BUILTIN(__builtin_ctzs) -+#if ABSL_HAVE_BUILTIN(__builtin_ctzs) && defined(__clang__) - static_assert(sizeof(unsigned short) == sizeof(x), // NOLINT(runtime/int) - "__builtin_ctzs does not take 16-bit arg"); - return __builtin_ctzs(x);