From 610db377f37b11dc779f658328a83380d2323ac7 Mon Sep 17 00:00:00 2001 From: "Denny C. Dai" Date: Fri, 10 Sep 2021 12:37:04 -0700 Subject: [PATCH] [objc] Fix firestone linux cocoapod grpc install issue (#27300) all checks green, merge and close --- src/objective-c/BoringSSL-GRPC.podspec | 15 ++++++++++----- .../objective-c/BoringSSL-GRPC.podspec.template | 15 ++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/objective-c/BoringSSL-GRPC.podspec b/src/objective-c/BoringSSL-GRPC.podspec index 3ae547013ab..382072545a1 100644 --- a/src/objective-c/BoringSSL-GRPC.podspec +++ b/src/objective-c/BoringSSL-GRPC.podspec @@ -153,14 +153,15 @@ Pod::Spec.new do |s| s.prepare_command = <<-END_OF_COMMAND # Add a module map and an umbrella header + mkdir -p src/include/openssl cat > src/include/openssl/umbrella.h < src/include/openssl/boringssl_prefix_symbols.h + case "$(uname)" in + Darwin) opts="" ;; + *) opts="--ignore-garbage" ;; + esac + base64 --decode $opts < src/include/openssl/boringssl_prefix_symbols.h H4sICAAAAAAC/2JvcmluZ3NzbF9wcmVmaXhfc3ltYm9scy5oAKydXXPbuJZo3+dXuO683Kk6NRM77bT7 vim20tG0Y/tISk9nXliURNk8oUiFoOy4f/0FQErEx94g94arTs10LK21KQDEF0Hgv/7r7DErszptss3Z 6vX0j2RV1Xn5KESR7Otsm/9MnrJ0k9X/KZ7OqvLso/50sbg9W1e7Xd78v7Pt+pdfPlxepL9crN7/9iE7 diff --git a/templates/src/objective-c/BoringSSL-GRPC.podspec.template b/templates/src/objective-c/BoringSSL-GRPC.podspec.template index 323286a055d..d5534ce2107 100644 --- a/templates/src/objective-c/BoringSSL-GRPC.podspec.template +++ b/templates/src/objective-c/BoringSSL-GRPC.podspec.template @@ -183,14 +183,15 @@ s.prepare_command = <<-END_OF_COMMAND # Add a module map and an umbrella header + mkdir -p src/include/openssl cat > src/include/openssl/umbrella.h < src/include/openssl/boringssl_prefix_symbols.h + case "$(uname)" in + Darwin) opts="" ;; + *) opts="--ignore-garbage" ;; + esac + base64 --decode $opts < src/include/openssl/boringssl_prefix_symbols.h % for line in compress_boringssl_prefix_header(): ${line.decode('utf-8')} % endfor