[openssl] Support custom cflags on Windows #24133
Merged
Conversation
This file contains 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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 99346bb6926e85d93e4aad330bf28cce4a18051b -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index cb140f1..4695591 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5154,7 +5154,7 @@
},
"openssl": {
"baseline": "3.0.2",
- "port-version": 2
+ "port-version": 3
},
"openssl-unix": {
"baseline": "1.1.1h",
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index 207c896..a1ef951 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "65054babd2e2516e892e929c8761165a59850751",
+ "version": "3.0.2",
+ "port-version": 3
+ },
{
"git-tree": "66e7ff434d21a4fc00cab9bbe6167db295ffefd3",
"version": "3.0.2",
ras0219-msft
force-pushed
the
dev/roschuma/openssl
branch
from
aa3d6c6 to
b1238f5
Compare
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 99346bb6926e85d93e4aad330bf28cce4a18051b -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index cb140f1..4695591 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5154,7 +5154,7 @@
},
"openssl": {
"baseline": "3.0.2",
- "port-version": 2
+ "port-version": 3
},
"openssl-unix": {
"baseline": "1.1.1h",
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index 207c896..18641f0 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "1237f47607ad00a8387cef4d78879ff7acd6c7af",
+ "version": "3.0.2",
+ "port-version": 3
+ },
{
"git-tree": "66e7ff434d21a4fc00cab9bbe6167db295ffefd3",
"version": "3.0.2",
ras0219-msft
force-pushed
the
dev/roschuma/openssl
branch
from
b1238f5 to
8f2244c
Compare
JackBoosY
added
category:port-feature
Neumann-A
reviewed
Apr 14, 2022
| set(ENV{LD} "${VCPKG_DETECTED_CMAKE_LINKER}") | ||
|
|
||
| # OpenSSL's buildsystem hardcodes certain PDB manipulations, so we cannot use Z7 | ||
| string(REGEX REPLACE "(^| )-Z7($| )" " " VCPKG_COMBINED_C_FLAGS_RELEASE "${VCPKG_COMBINED_C_FLAGS_RELEASE}") |
There was a problem hiding this comment.
string(REGEX REPLACE "(^| )-Z7($| )" " " VCPKG_COMBINED_C_FLAGS_RELEASE "${VCPKG_COMBINED_C_FLAGS_RELEASE}")
Fun fact: The reason I did use " " instead of "${CMAKE_MATCH_<N>}" is because I didn't bother finding out which one is the correct N. I assume it is 2 but I didn't want to build ffmpeg (and all its dependencies) locally to figure out if it is correct.
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
…as0219-msft/24133
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
Seems good now? |
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
PRs must add only one version and must not modify any published versions
When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.
Error: Local changes detected for openssl but no changes to version or port version.
-- Version: 3.0.3#1
-- Old SHA: 13d089c0d416018d6e60a25fe68794561d2b1dd5
-- New SHA: 2024765c9acae15fb1e091fd939353c533847136
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
PRs must add only one version and must not modify any published versions
When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.
error: checked-in files for openssl have changed but the version was not updated
version: 3.0.3#1
old SHA: 13d089c0d416018d6e60a25fe68794561d2b1dd5
new SHA: 2024765c9acae15fb1e091fd939353c533847136
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
Neumann-A
reviewed
May 12, 2022
ras0219-msft
force-pushed
the
dev/roschuma/openssl
branch
from
4069322 to
10e29ed
Compare
|
Thanks for the fix! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR enables custom CFLAGS, ARFLAGS, and LDFLAGS to be passed to Openssl's build on Windows (for example: CFG and Spectre-mitigations).