[openssl] fix cross compilation with mingw #17246
Conversation
|
|
NancyLi1013
added
category:port-feature
|
Hi @d12fk Thanks for your PR. Could you please run |
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
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
The failures caused by |
NancyLi1013
added
the
depends:different-pr
|
/azp run |
NancyLi1013
removed
the
depends:different-pr
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
LGTM now, thanks for your fixing @d12fk. |
strega-nil-ms
force-pushed
the
openssl-mingw-windres
branch
from
5e9d796 to
d920e67
Compare
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
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
Could you please rebase to solve the conflicts? |
NancyLi1013
removed
the
info:reviewed
…ssl-mingw-windres # Conflicts: # ports/openssl/CONTROL # ports/openssl/unix/CMakeLists.txt # versions/baseline.json # versions/o-/openssl.json
|
@d12fk, could you resolve the conflicts? |
|
@d12fk Is work still being done for this PR? |
|
@NancyLi1013 The fix is still needed. A merge conflict exists only in the versions. Can't you just push the version updates? |
…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",
Thanks for your confirmation and reminder. @d12fk I have merged master and updated versions. |
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.