-
Notifications
You must be signed in to change notification settings - Fork 7.5k
[boringssl] Add new port #8455
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
[boringssl] Add new port #8455
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
69d17aa
[boringssl] Add new port
a989601
Merge remote-tracking branch 'upstream/master' into dev/qis/boringssl
9798454
removed usage of deprecated vcpkg functions
cc59720
let the ci treat boringssl like libressl
81dbd4c
applied requested changes
75f4eb3
Merge remote-tracking branch 'microsoft/master' into dev/qis/boringssl
48b0967
[boringssl] Update to commit 590265773@2020-04-07 (#8455)
e089bf3
[boringssl] Restore scripts/ci.baseline.txt
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +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() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| Source: boringssl | ||
| Version: 2020-04-07 | ||
| Homepage: https://boringssl.googlesource.com/boringssl | ||
| Description: BoringSSl is a fork of OpenSSL developed by Google | ||
| Supports: !uwp | ||
|
|
||
| Feature: tools | ||
| Description: Build bssl executable | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| 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() | ||
| endif() | ||
|
|
||
| vcpkg_find_acquire_program(PERL) | ||
| get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) | ||
| vcpkg_add_to_path(${PERL_EXE_PATH}) | ||
|
|
||
| vcpkg_find_acquire_program(NASM) | ||
| get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) | ||
| vcpkg_add_to_path(${NASM_EXE_PATH}) | ||
|
|
||
| vcpkg_find_acquire_program(GO) | ||
| 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 | ||
| ) | ||
|
|
||
| vcpkg_from_github( | ||
| OUT_SOURCE_PATH SOURCE_PATH | ||
| REPO google/boringssl | ||
| REF 5902657734e2a796a514731e0fd0e80081ae43dc | ||
| SHA512 89458748ccf7e00e2e12a1026e7c41099298dfb6d0daaf885f52b98c84e833a4407e997dd3a5b92d56ede495ef431325a4b228c2d81598bde082141339b16684 | ||
| HEAD_REF master | ||
| PATCHES | ||
| 0001-vcpkg.patch | ||
| ) | ||
|
|
||
| vcpkg_configure_cmake( | ||
| SOURCE_PATH ${SOURCE_PATH} | ||
| PREFER_NINJA | ||
| OPTIONS | ||
| ${FEATURE_OPTIONS} | ||
| OPTIONS_DEBUG | ||
| -DINSTALL_HEADERS=OFF | ||
| -DINSTALL_TOOLS=OFF | ||
| ) | ||
|
|
||
| vcpkg_install_cmake() | ||
|
|
||
| if(IS_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/boringssl) | ||
| vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/boringssl") | ||
| endif() | ||
|
|
||
| file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.