[openssl] fix cross compilation with mingw#17246
Merged
vicroms merged 8 commits intomicrosoft:masterfrom Oct 16, 2021
Merged
Conversation
|
|
NancyLi1013
added
category:port-feature
NancyLi1013
reviewed
Apr 13, 2021
Contributor
|
Hi @d12fk Thanks for your PR. Could you please run |
Contributor
Author
Indeed, forgot to add them to the commit. Will update right away. |
d12fk
force-pushed
the
openssl-mingw-windres
branch
from
dc6dadd to
5e9d796
Compare
NancyLi1013
approved these changes
Apr 13, 2021
Contributor
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Contributor
|
The failures caused by |
NancyLi1013
added
the
depends:different-pr
Contributor
|
/azp run |
NancyLi1013
removed
the
depends:different-pr
|
Azure Pipelines successfully started running 1 pipeline(s). |
Contributor
|
LGTM now, thanks for your fixing @d12fk. |
NancyLi1013
added
the
info:needs-maintainer-attention
strega-nil-ms
force-pushed
the
openssl-mingw-windres
branch
from
5e9d796 to
d920e67
Compare
longnguyen2004
approved these changes
May 1, 2021
Contributor
There was a problem hiding this comment.
LGTM. Let's get this merged soon.
@d12fk Please resolve the merge conflicts.
When cross compiling openssl on Linux, e.g. ./vcpkg install openssl:x64-mingw-dynamic failed, because 'windres' was not found. The call to openssl's Configure was missing the WINDRES environment variable, which is needed in case it is prefixed. On Ubuntu the binutils-mingw-w64-x86-64 package installed it as /usr/bin/x86_64-w64-mingw32-windres. Since mingw uses openssl-unix to build, it's worth mentioning that the WINDRES env has no impact for non-mingw and is ignored there.
strega-nil-ms
force-pushed
the
openssl-mingw-windres
branch
from
d920e67 to
0804a21
Compare
Contributor
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Contributor
|
Could you please rebase to solve the conflicts? |
NancyLi1013
removed
the
info:needs-maintainer-attention
added 3 commits
July 20, 2021 01:27
…ssl-mingw-windres # Conflicts: # ports/openssl/CONTROL # ports/openssl/unix/CMakeLists.txt # versions/baseline.json # versions/o-/openssl.json
Contributor
strega-nil-ms
approved these changes
Jul 21, 2021
NancyLi1013
suggested changes
Jul 22, 2021
Contributor
|
@d12fk, could you resolve the conflicts? |
Contributor
|
@d12fk Is work still being done for this PR? |
Contributor
|
@NancyLi1013 The fix is still needed. A merge conflict exists only in the versions. Can't you just push the version updates? |
added 2 commits
October 8, 2021 01:34
…ssl-mingw-windres # Conflicts: # ports/openssl/vcpkg.json # versions/baseline.json # versions/o-/openssl.json
![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 973a7d517c09c8cfb7e6a548fcc260ca34ba7b60 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index caf39581..69a54b37 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "d5310e60291032390ab8c893794f6044a7b9ae04",
+ "version-string": "1.1.1l",
+ "port-version": 2
+ },
{
"git-tree": "6d19a647704efae9398b178a0012140c1f1ee8b8",
"version-string": "1.1.1l",
Contributor
Thanks for your confirmation and reminder. @d12fk I have merged master and updated versions. |
NancyLi1013
approved these changes
Oct 8, 2021
NancyLi1013
added
the
info:needs-maintainer-attention
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
When cross compiling openssl on Linux, e.g.
./vcpkg install openssl:x64-mingw-dynamic
failed, because 'windres' was not found. The call to
openssl's Configure was missing the WINDRES environment
variable, which is needed in case it is prefixed. On
Ubuntu the binutils-mingw-w64-x86-64 package installed
it as /usr/bin/x86_64-w64-mingw32-windres.
Since mingw uses openssl-unix to build, it's worth mentioning
that the WINDRES env has no impact for non-mingw and is ignored
there.