Skip to content
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

[boringssl] Remove -WX and -Werror #24899

Merged
merged 8 commits into from
Jun 2, 2022
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 02b661f9d056dc4a91dc317bc8f0e92e784c7345 Mon Sep 17 00:00:00 2001
From: Ryan Pavlik <[email protected]>
Date: Tue, 24 May 2022 11:03:08 -0500
Subject: [PATCH] Disable C4191 warning to fix VS2022 build.

Works around https://bugs.chromium.org/p/boringssl/issues/detail?id=495 for now.
---
CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83ff477..398e97f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,6 +229,7 @@ elseif(MSVC)
"C5027" # move assignment operator was implicitly defined as deleted
"C5045" # Compiler will insert Spectre mitigation for memory load if
# /Qspectre switch specified
+ "C4191" # Unsafe cast (we use it as a type-erased type) - see https://bugs.chromium.org/p/boringssl/issues/detail?id=495
LilyWangLL marked this conversation as resolved.
Show resolved Hide resolved
)
set(MSVC_LEVEL4_WARNINGS_LIST
# See https://connect.microsoft.com/VisualStudio/feedback/details/1217660/warning-c4265-when-using-functional-header
--
2.36.0.windows.1

10 changes: 5 additions & 5 deletions ports/boringssl/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@ vcpkg_from_github(
PATCHES
0001-vcpkg.patch
0002-disable-waring-4065.patch
0003-Disable-C4191-warning-to-fix-VS2022-build.patch
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FEATURE_OPTIONS}
OPTIONS_DEBUG
-DINSTALL_HEADERS=OFF
-DINSTALL_TOOLS=OFF
)

vcpkg_install_cmake()
vcpkg_cmake_install()

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)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
8 changes: 7 additions & 1 deletion ports/boringssl/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
{
"name": "boringssl",
"version-date": "2021-06-23",
"port-version": 1,
"port-version": 2,
"description": "BoringSSl is a fork of OpenSSL developed by Google",
"homepage": "https://boringssl.googlesource.com/boringssl",
"supports": "!uwp",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
}
],
"features": {
"tools": {
"description": "Build bssl executable"
Expand Down
5 changes: 5 additions & 0 deletions versions/b-/boringssl.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "adcf221b8e394dcf3acc3543d9cbe33ee42ffac5",
"version-date": "2021-06-23",
"port-version": 2
},
{
"git-tree": "ca35c06a32c83f385f840831a435c69231a7852a",
"version-date": "2021-06-23",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@
},
"boringssl": {
"baseline": "2021-06-23",
"port-version": 1
"port-version": 2
},
"botan": {
"baseline": "2.19.1",
Expand Down