From 1d94aa92d883c40abe8b064d79e682f27b432cd3 Mon Sep 17 00:00:00 2001 From: Hannah Shi Date: Thu, 5 May 2022 15:34:49 -0700 Subject: [PATCH] remove xxhash.h patch (#29440) --- gRPC-C++.podspec | 4 +--- gRPC-Core.podspec | 4 +--- templates/gRPC-C++.podspec.template | 4 +--- templates/gRPC-Core.podspec.template | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index c94ab54f97a..17bcde13db4 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -1843,11 +1843,9 @@ Pod::Spec.new do |s| end # patch include of openssl to openssl_grpc - # patch xxhash.h to silent the -Wdocumentation error s.prepare_command = <<-END_OF_COMMAND set -e find src/core -type f \\( -path '*.h' -or -path '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include ;#if COCOAPODS==1\\\n #include \\\n#else\\\n #include \\\n#endif;g' - find third_party/xxhash -type f -name xxhash.h -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;@param([^,]*),;@param\\1 ,;g' - find src/core/ third_party/xxhash/ -type f -name '*.grpc_back' -print0 | xargs -0 rm + find src/core/ -type f -name '*.grpc_back' -print0 | xargs -0 rm END_OF_COMMAND end diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 9f350953828..37090468cb0 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -2608,11 +2608,9 @@ Pod::Spec.new do |s| end # patch include of openssl to openssl_grpc - # patch xxhash.h to silent the -Wdocumentation error s.prepare_command = <<-END_OF_COMMAND set -e find src/core -type f \\( -path '*.h' -or -path '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include ;#if COCOAPODS==1\\\n #include \\\n#else\\\n #include \\\n#endif;g' - find third_party/xxhash -type f -name xxhash.h -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;@param([^,]*),;@param\\1 ,;g' - find src/core/ third_party/xxhash/ -type f -name '*.grpc_back' -print0 | xargs -0 rm + find src/core/ -type f -name '*.grpc_back' -print0 | xargs -0 rm END_OF_COMMAND end diff --git a/templates/gRPC-C++.podspec.template b/templates/gRPC-C++.podspec.template index bb32d2c08ab..7d74017ce29 100644 --- a/templates/gRPC-C++.podspec.template +++ b/templates/gRPC-C++.podspec.template @@ -204,11 +204,9 @@ end # patch include of openssl to openssl_grpc - # patch xxhash.h to silent the -Wdocumentation error s.prepare_command = <<-END_OF_COMMAND set -e find src/core -type f \\( -path '*.h' -or -path '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include ;#if COCOAPODS==1\\\n #include \\\n#else\\\n #include \\\n#endif;g' - find third_party/xxhash -type f -name xxhash.h -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;@param([^,]*),;@param\\1 ,;g' - find src/core/ third_party/xxhash/ -type f -name '*.grpc_back' -print0 | xargs -0 rm + find src/core/ -type f -name '*.grpc_back' -print0 | xargs -0 rm END_OF_COMMAND end diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template index da7b6bf4243..6588dd4d92c 100644 --- a/templates/gRPC-Core.podspec.template +++ b/templates/gRPC-Core.podspec.template @@ -239,11 +239,9 @@ end # patch include of openssl to openssl_grpc - # patch xxhash.h to silent the -Wdocumentation error s.prepare_command = <<-END_OF_COMMAND set -e find src/core -type f \\( -path '*.h' -or -path '*.cc' \\) -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;#include ;#if COCOAPODS==1\\\n #include \\\n#else\\\n #include \\\n#endif;g' - find third_party/xxhash -type f -name xxhash.h -print0 | xargs -0 -L1 sed -E -i'.grpc_back' 's;@param([^,]*),;@param\\1 ,;g' - find src/core/ third_party/xxhash/ -type f -name '*.grpc_back' -print0 | xargs -0 rm + find src/core/ -type f -name '*.grpc_back' -print0 | xargs -0 rm END_OF_COMMAND end