mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 18:32:47 +08:00
[boringssl] update to newer commit (#18604)
* [boringssl] update to newer commit * update version
This commit is contained in:
parent
b504547c13
commit
3b58466098
@ -1,32 +1,32 @@
|
||||
diff --git i/CMakeLists.txt w/CMakeLists.txt
|
||||
index 75bf9981b..15589a760 100644
|
||||
--- i/CMakeLists.txt
|
||||
+++ w/CMakeLists.txt
|
||||
@@ -564,7 +564,7 @@ endif()
|
||||
|
||||
# Add minimal googletest targets. The provided one has many side-effects, and
|
||||
# googletest has a very straightforward build.
|
||||
-add_library(boringssl_gtest third_party/googletest/src/gtest-all.cc)
|
||||
+add_library(boringssl_gtest STATIC third_party/googletest/src/gtest-all.cc)
|
||||
target_include_directories(boringssl_gtest PRIVATE third_party/googletest)
|
||||
|
||||
include_directories(third_party/googletest/include)
|
||||
@@ -621,3 +621,18 @@ add_custom_target(
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||
DEPENDS all_tests bssl_shim handshaker
|
||||
${MAYBE_USES_TERMINAL})
|
||||
+
|
||||
+install(TARGETS crypto ssl
|
||||
+ RUNTIME DESTINATION bin
|
||||
+ LIBRARY DESTINATION lib
|
||||
+ ARCHIVE DESTINATION lib)
|
||||
+
|
||||
+option(INSTALL_HEADERS "Install headers" ON)
|
||||
+if(INSTALL_HEADERS)
|
||||
+ install(DIRECTORY include/ DESTINATION include)
|
||||
+endif()
|
||||
+
|
||||
+option(INSTALL_TOOLS "Install bssl executable" OFF)
|
||||
+if(INSTALL_TOOLS)
|
||||
+ install(TARGETS bssl DESTINATION tools/boringssl)
|
||||
+endif()
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 893bca7..83ff477 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -562,7 +562,7 @@ endif()
|
||||
|
||||
# Add minimal googletest targets. The provided one has many side-effects, and
|
||||
# googletest has a very straightforward build.
|
||||
-add_library(boringssl_gtest third_party/googletest/src/gtest-all.cc)
|
||||
+add_library(boringssl_gtest STATIC third_party/googletest/src/gtest-all.cc)
|
||||
target_include_directories(boringssl_gtest PRIVATE third_party/googletest)
|
||||
|
||||
include_directories(third_party/googletest/include)
|
||||
@@ -649,3 +649,18 @@ add_custom_target(
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||
DEPENDS all_tests bssl_shim handshaker fips_specific_tests_if_any
|
||||
USES_TERMINAL)
|
||||
+
|
||||
+install(TARGETS crypto ssl
|
||||
+ RUNTIME DESTINATION bin
|
||||
+ LIBRARY DESTINATION lib
|
||||
+ ARCHIVE DESTINATION lib)
|
||||
+
|
||||
+option(INSTALL_HEADERS "Install headers" ON)
|
||||
+if(INSTALL_HEADERS)
|
||||
+ install(DIRECTORY include/ DESTINATION include)
|
||||
+endif()
|
||||
+
|
||||
+option(INSTALL_TOOLS "Install bssl executable" OFF)
|
||||
+if(INSTALL_TOOLS)
|
||||
+ install(TARGETS bssl DESTINATION tools/boringssl)
|
||||
+endif()
|
||||
|
@ -1,9 +0,0 @@
|
||||
Source: boringssl
|
||||
Version: 2020-04-07
|
||||
Port-Version: 2
|
||||
Homepage: https://boringssl.googlesource.com/boringssl
|
||||
Description: BoringSSl is a fork of OpenSSL developed by Google
|
||||
Supports: !uwp
|
||||
|
||||
Feature: tools
|
||||
Description: Build bssl executable
|
@ -17,14 +17,15 @@ get_filename_component(GO_EXE_PATH ${GO} DIRECTORY)
|
||||
vcpkg_add_to_path(${GO_EXE_PATH})
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
tools INSTALL_TOOLS
|
||||
FEATURES
|
||||
tools INSTALL_TOOLS
|
||||
)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO google/boringssl
|
||||
REF 5902657734e2a796a514731e0fd0e80081ae43dc
|
||||
SHA512 89458748ccf7e00e2e12a1026e7c41099298dfb6d0daaf885f52b98c84e833a4407e997dd3a5b92d56ede495ef431325a4b228c2d81598bde082141339b16684
|
||||
REF 479adf98d54a21c1d154aac59b2ce120e1d1a6d6
|
||||
SHA512 74b5d001c0f5c1846b8818e9e668fa35de5171fc21a8f713d241f57b3e8abe42426fdc66b085cca1853b904def6f4bea573dfed40b8b1422894cca85b0b1a44a
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
0001-vcpkg.patch
|
||||
|
12
ports/boringssl/vcpkg.json
Normal file
12
ports/boringssl/vcpkg.json
Normal file
@ -0,0 +1,12 @@
|
||||
{
|
||||
"name": "boringssl",
|
||||
"version-date": "2021-06-23",
|
||||
"description": "BoringSSl is a fork of OpenSSL developed by Google",
|
||||
"homepage": "https://boringssl.googlesource.com/boringssl",
|
||||
"supports": "!uwp",
|
||||
"features": {
|
||||
"tools": {
|
||||
"description": "Build bssl executable"
|
||||
}
|
||||
}
|
||||
}
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "aa2649d9a0296ed873aa8fb17c28f38baac51a26",
|
||||
"version-date": "2021-06-23",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "efaff27f5d50195917c54e210f4904b80d73399a",
|
||||
"version-string": "2020-04-07",
|
||||
|
@ -1033,8 +1033,8 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"boringssl": {
|
||||
"baseline": "2020-04-07",
|
||||
"port-version": 2
|
||||
"baseline": "2021-06-23",
|
||||
"port-version": 0
|
||||
},
|
||||
"botan": {
|
||||
"baseline": "2.16.0",
|
||||
|
Loading…
Reference in New Issue
Block a user