-
Notifications
You must be signed in to change notification settings - Fork 6.4k
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
[libressl] Update to v4.0.0 #42145
base: master
Are you sure you want to change the base?
[libressl] Update to v4.0.0 #42145
Conversation
First time updating a port so happy to do whatever is needed to land this. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just adding some notice on upstreaming attempts.
ports/libressl/patches/0002-Add-option-to-enable-spectre-mitigation-in-MSVC.patch
Outdated
Show resolved
Hide resolved
ports/libressl/patches/0003-Disable-additional-MSVC-warnings.patch
Outdated
Show resolved
Hide resolved
ports/libressl/patches/0002-Add-option-to-enable-spectre-mitigation-in-MSVC.patch
Outdated
Show resolved
Hide resolved
ports/libressl/patches/0003-Disable-additional-MSVC-warnings.patch
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok will make the changes tomorrow. Thanks for the review!
ports/libressl/patches/0003-Disable-additional-MSVC-warnings.patch
Outdated
Show resolved
Hide resolved
ports/libressl/patches/0002-Add-option-to-enable-spectre-mitigation-in-MSVC.patch
Outdated
Show resolved
Hide resolved
Removes `0002-suppress-msvc-warnings.patch`. The warnings were fixed and upstreamed into a downloaded patch. The spectre mitigation flags should be added in a triplet file.
d96373e
to
5337eb9
Compare
5337eb9
to
7415604
Compare
Okay @dg0yt and @LilyWangLL think this is ready to go |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No more patching for warnings which are never looked at if not an upstream dev. 👍
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 2f0dfa0..594c56f 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -136,6 +136,10 @@ if(WIN32) | ||
endif() | ||
set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32 ntdll bcrypt) | ||
endif() | ||
+if(MSVC AND MSVC_VERSION GREATER_EQUAL 1912) | ||
+ message(STATUS "Setting /Qspectre switch") | ||
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Qspectre") | ||
+endif() | ||
|
||
if(MSVC) | ||
add_definitions(-Dinline=__inline) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I do note that the port would no longer unconditionally enable spectre mitigation for newer MSVC. (This implements what I said about the new feature. I highlight the change because it was hidden in a patch with a different topic.)
./vcpkg x-add-version --all
and committing the result.