diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-08-18 16:41:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-18 16:41:19 -0700 |
| commit | f8c167c9b6755185ac765882c1432e1f0adb7283 (patch) | |
| tree | ceb180df530b924c0a7d8bd80dad75da16926d36 | |
| parent | 0e60bcd44f5e58d76b5d9aa3fd67931122abe14c (diff) | |
| download | vcpkg-f8c167c9b6755185ac765882c1432e1f0adb7283.tar.gz vcpkg-f8c167c9b6755185ac765882c1432e1f0adb7283.zip | |
[borringssl] Disable report warning 4065 and set file conflict as FATAL_ERROR (#12967)
| -rw-r--r-- | ports/boringssl/0002-disable-waring-4065.patch | 13 | ||||
| -rw-r--r-- | ports/boringssl/CONTROL | 1 | ||||
| -rw-r--r-- | ports/boringssl/portfile.cmake | 5 |
3 files changed, 16 insertions, 3 deletions
diff --git a/ports/boringssl/0002-disable-waring-4065.patch b/ports/boringssl/0002-disable-waring-4065.patch new file mode 100644 index 000000000..9e72aeb59 --- /dev/null +++ b/ports/boringssl/0002-disable-waring-4065.patch @@ -0,0 +1,13 @@ +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/ports/boringssl/CONTROL b/ports/boringssl/CONTROL index fb8d41ce7..5cfa543f1 100644 --- a/ports/boringssl/CONTROL +++ b/ports/boringssl/CONTROL @@ -1,5 +1,6 @@ Source: boringssl Version: 2020-04-07 +Port-Version: 1 Homepage: https://boringssl.googlesource.com/boringssl Description: BoringSSl is a fork of OpenSSL developed by Google Supports: !uwp diff --git a/ports/boringssl/portfile.cmake b/ports/boringssl/portfile.cmake index a4b5acbc4..80068da8d 100644 --- a/ports/boringssl/portfile.cmake +++ b/ports/boringssl/portfile.cmake @@ -1,9 +1,7 @@ vcpkg_fail_port_install(ON_TARGET "UWP") if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h") - message(WARNING "Can't build BoringSSL if OpenSSL is installed. Please remove OpenSSL, and try to install BoringSSL again if you need it. Build will continue since BoringSSL is a drop-in replacement for OpenSSL") - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - return() + message(FATAL_ERROR "Can't build BoringSSL if OpenSSL is installed. Please remove OpenSSL, and try to install BoringSSL again if you need it. Build will continue since BoringSSL is a drop-in replacement for OpenSSL") endif() vcpkg_find_acquire_program(PERL) @@ -30,6 +28,7 @@ vcpkg_from_github( HEAD_REF master PATCHES 0001-vcpkg.patch + 0002-disable-waring-4065.patch ) vcpkg_configure_cmake( |