[boringssl] Fix build error on unix (microsoft#13056)

ndk · Aug 21, 2020 · f2a5971 · f2a5971
1 parent 5a240bc
commit f2a5971
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/ports/boringssl/0002-disable-waring-4065.patch b/ports/boringssl/0002-disable-waring-4065.patch
@@ -1,13 +1,15 @@
-diff --git a/decrepit/CMakeLists.txt b/decrepit/CMakeLists.txt
-index ef95a6b..ad7c8d8 100644
---- a/decrepit/CMakeLists.txt
-+++ b/decrepit/CMakeLists.txt
-@@ -24,6 +24,8 @@ add_library(
-
- add_dependencies(decrepit global_target)
-
-+target_compile_options(decrepit PRIVATE /wd4065)
-+
- target_link_libraries(decrepit crypto ssl)
-
- add_executable(
+diff --git a/decrepit/CMakeLists.txt b/decrepit/CMakeLists.txt
+index ef95a6b..0b52c05 100644
+--- a/decrepit/CMakeLists.txt
++++ b/decrepit/CMakeLists.txt
+@@ -40,6 +40,10 @@ add_executable(
+
+ add_dependencies(decrepit_test global_target)
+
++if(MSVC)
++  target_compile_options(decrepit PRIVATE /wd4065)
++endif()
++
+ target_link_libraries(decrepit_test test_support_lib boringssl_gtest decrepit
+                       crypto)
+ if(WIN32)
diff --git a/ports/boringssl/CONTROL b/ports/boringssl/CONTROL
@@ -1,6 +1,6 @@
 Source: boringssl
 Version: 2020-04-07
-Port-Version: 1
+Port-Version: 2
 Homepage: https://boringssl.googlesource.com/boringssl
 Description: BoringSSl is a fork of OpenSSL developed by Google
 Supports: !uwp