diff options
| author | Billy Robert O'Neal III <bion@microsoft.com> | 2020-08-28 16:31:27 -0700 |
|---|---|---|
| committer | Billy Robert O'Neal III <bion@microsoft.com> | 2020-08-28 16:31:27 -0700 |
| commit | c828f3634723996e6031fb2e3c3d1ac3f4de0cad (patch) | |
| tree | b3fe00a043d5b9351868a0d1f8aead41bb52d2be /ports/boringssl | |
| parent | 6635a2fa596ca457565eebc2a45664309cd24d77 (diff) | |
| parent | f3f329a048eaff759c1992c458f2e12351486bc7 (diff) | |
| download | vcpkg-update-geos-381.tar.gz vcpkg-update-geos-381.zip | |
Merge remote-tracking branch 'origin/master' into HEADupdate-geos-381
Diffstat (limited to 'ports/boringssl')
| -rw-r--r-- | ports/boringssl/0002-disable-waring-4065.patch | 28 | ||||
| -rw-r--r-- | ports/boringssl/CONTROL | 2 |
2 files changed, 16 insertions, 14 deletions
diff --git a/ports/boringssl/0002-disable-waring-4065.patch b/ports/boringssl/0002-disable-waring-4065.patch index 9e72aeb59..88ffffaf0 100644 --- 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 index 5cfa543f1..1c8c4dcbf 100644 --- 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 |