From 2a7e2af747412e1dce2b08eb1032f2c6793368d9 Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Fri, 8 Nov 2019 10:58:12 -0800 Subject: [PATCH] Fix a typo and a format issue --- src/objective-c/BoringSSL-GRPC.podspec | 13 ++++++------- .../src/objective-c/BoringSSL-GRPC.podspec.template | 13 ++++++------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/objective-c/BoringSSL-GRPC.podspec b/src/objective-c/BoringSSL-GRPC.podspec index 517c2e3e54b..d1cbef112f2 100644 --- a/src/objective-c/BoringSSL-GRPC.podspec +++ b/src/objective-c/BoringSSL-GRPC.podspec @@ -142,8 +142,6 @@ Pod::Spec.new do |s| 'crypto/*.h', 'crypto/**/*.h', 'third_party/fiat/*.h' - # bcm.c includes other source files, creating duplicated symbols. Since it is not used, we - # explicitly exclude it from the pod. # TODO (mxyan): Work with BoringSSL team to remove this hack. ss.exclude_files = '**/*_test.*', '**/test_*.*', @@ -1621,11 +1619,12 @@ Pod::Spec.new do |s| EOF - # The symbol prefixing mechanism is performed by redefining BoringSSL symbols with - # "#define SOME_BORINGSSL_SYMBOL GRPC_SHADOW_SOME_BORINGSSL_SYMBOL". Unfortunately, some symbols are already - # redefined as macros in BoringSSL headers in the form "#define SOME_BORINGSSL_SYMBOL SOME_BORINGSSL_SYMBOL" - # Such type of redefinition will cause "duplicate symbols" when using together with our prefix header. So - # the workaround in the below lines removes all such type of #define directives. + # The symbol prefixing mechanism is performed by redefining BoringSSL symbols with "#define + # SOME_BORINGSSL_SYMBOL GRPC_SHADOW_SOME_BORINGSSL_SYMBOL". Unfortunately, some symbols are + # already redefined as macros in BoringSSL headers in the form "#define SOME_BORINGSSL_SYMBOL + # SOME_BORINGSSL_SYMBOL" Such type of redefinition will cause "SOME_BORINGSSL_SYMBOL redefined" + # error when using together with our prefix header. So the workaround in the below lines removes + # all such type of #define directives. sed -i'.back' '/^#define \\([A-Za-z0-9_]*\\) \\1/d' include/openssl/*.h # Remove lines of the format below for the same reason above # #define SOME_BORINGSSL_SYMBOL \ diff --git a/templates/src/objective-c/BoringSSL-GRPC.podspec.template b/templates/src/objective-c/BoringSSL-GRPC.podspec.template index 3d0ca89f091..4c145de5e79 100644 --- a/templates/src/objective-c/BoringSSL-GRPC.podspec.template +++ b/templates/src/objective-c/BoringSSL-GRPC.podspec.template @@ -149,8 +149,6 @@ 'crypto/*.h', 'crypto/**/*.h', 'third_party/fiat/*.h' - # bcm.c includes other source files, creating duplicated symbols. Since it is not used, we - # explicitly exclude it from the pod. # TODO (mxyan): Work with BoringSSL team to remove this hack. ss.exclude_files = '**/*_test.*', '**/test_*.*', @@ -224,11 +222,12 @@ % endfor EOF - # The symbol prefixing mechanism is performed by redefining BoringSSL symbols with - # "#define SOME_BORINGSSL_SYMBOL GRPC_SHADOW_SOME_BORINGSSL_SYMBOL". Unfortunately, some symbols are already - # redefined as macros in BoringSSL headers in the form "#define SOME_BORINGSSL_SYMBOL SOME_BORINGSSL_SYMBOL" - # Such type of redefinition will cause "duplicate symbols" when using together with our prefix header. So - # the workaround in the below lines removes all such type of #define directives. + # The symbol prefixing mechanism is performed by redefining BoringSSL symbols with "#define + # SOME_BORINGSSL_SYMBOL GRPC_SHADOW_SOME_BORINGSSL_SYMBOL". Unfortunately, some symbols are + # already redefined as macros in BoringSSL headers in the form "#define SOME_BORINGSSL_SYMBOL + # SOME_BORINGSSL_SYMBOL" Such type of redefinition will cause "SOME_BORINGSSL_SYMBOL redefined" + # error when using together with our prefix header. So the workaround in the below lines removes + # all such type of #define directives. sed -i'.back' '/^#define \\([A-Za-z0-9_]*\\) \\1/d' include/openssl/*.h # Remove lines of the format below for the same reason above # #define SOME_BORINGSSL_SYMBOL ${"\\"}