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.

Sign up for GitHub

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

Jump to bottom

[openssl] fix cross compilation with mingw #17246

Merged
merged 8 commits into from
Oct 16, 2021
Merged

[openssl] fix cross compilation with mingw #17246

merged 8 commits into from
Oct 16, 2021

Conversation

d12fk
Copy link
Contributor

@d12fk d12fk commented Apr 12, 2021

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.

@ghost
Copy link

ghost commented Apr 12, 2021 •
edited by ghost
Loading

CLA assistant check
All CLA requirements met.

@NancyLi1013 NancyLi1013 self-assigned this Apr 13, 2021
@NancyLi1013 NancyLi1013 added category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist category:community-triplet A PR or issue related to community triplets not officially validated by the vcpkg team. labels Apr 13, 2021
@NancyLi1013
Copy link
Contributor

Hi @d12fk

Thanks for your PR.

Could you please run vcpkg x-add-version openssl to update the version files?

@d12fk
Copy link
Contributor Author

d12fk commented Apr 13, 2021

Hi @d12fk

Thanks for your PR.

Could you please run vcpkg x-add-version openssl to update the version files?

Indeed, forgot to add them to the commit. Will update right away.

@d12fk d12fk requested a review from NancyLi1013 April 13, 2021 02:15
@NancyLi1013
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@NancyLi1013
Copy link
Contributor

The failures caused by popsift will be fixed by #17277.

@NancyLi1013 NancyLi1013 added the depends:different-pr This PR or Issue depends on a PR which has been filed label Apr 14, 2021
@NancyLi1013
Copy link
Contributor

/azp run

@NancyLi1013 NancyLi1013 removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Apr 15, 2021
@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@NancyLi1013
Copy link
Contributor

LGTM now, thanks for your fixing @d12fk.

@NancyLi1013 NancyLi1013 added the info:reviewed Pull Request changes follow basic guidelines label Apr 16, 2021
@dg0yt dg0yt mentioned this pull request Apr 30, 2021
Merged
longnguyen2004
longnguyen2004 approved these changes May 1, 2021
View reviewed changes
Copy link
Contributor

@longnguyen2004 longnguyen2004 left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Let's get this merged soon.
@d12fk Please resolve the merge conflicts.

@d12fk @strega-nil
[openssl] fix cross compilation with mingw
0804a21 
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
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@NancyLi1013
Copy link
Contributor

@d12fk

Could you please rebase to solve the conflicts?

@NancyLi1013 NancyLi1013 removed the info:reviewed Pull Request changes follow basic guidelines label May 7, 2021
@dg0yt dg0yt mentioned this pull request Jun 20, 2021
Merged
NancyLi1013 added 3 commits July 20, 2021 01:27
Merge branch 'master' of https://github.com/Microsoft/vcpkg into open…
eeae52c 
…ssl-mingw-windres

# Conflicts:
#	ports/openssl/CONTROL
#	ports/openssl/unix/CMakeLists.txt
#	versions/baseline.json
#	versions/o-/openssl.json
Handle conflicts
d594739
Update version files
0cb1acc
@longnguyen2004
Copy link
Contributor

@d12fk Can you test #18554? It seems to be fixed there

strega-nil-ms
strega-nil-ms approved these changes Jul 21, 2021
View reviewed changes
ports/openssl/unix/CMakeLists.txt Outdated Show resolved Hide resolved
NancyLi1013
NancyLi1013 suggested changes Jul 22, 2021
View reviewed changes
versions/o-/openssl.json Outdated Show resolved Hide resolved
@PhoebeHui
Copy link
Contributor

@d12fk, could you resolve the conflicts?

@NancyLi1013
Copy link
Contributor

@d12fk Is work still being done for this PR?

@dg0yt
Copy link
Contributor

dg0yt commented Sep 30, 2021

@NancyLi1013 The fix is still needed. A merge conflict exists only in the versions. Can't you just push the version updates?

NancyLi1013 added 2 commits October 8, 2021 01:34
Merge branch 'master' of https://github.com/Microsoft/vcpkg into open…
4a70518 
…ssl-mingw-windres

# Conflicts:
#	ports/openssl/vcpkg.json
#	versions/baseline.json
#	versions/o-/openssl.json
Update versions/o-/openssl.json
4b18fc3
github-actions[bot]
github-actions bot requested changes Oct 8, 2021
View reviewed changes
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 --all
Diff 
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",

@NancyLi1013
Copy link
Contributor

@NancyLi1013 The fix is still needed. A merge conflict exists only in the versions. Can't you just push the version updates?

Thanks for your confirmation and reminder. @d12fk

I have merged master and updated versions.

@NancyLi1013 NancyLi1013 added the info:reviewed Pull Request changes follow basic guidelines label Oct 15, 2021
@vicroms vicroms merged commit b28d77a into microsoft:master Oct 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@longnguyen2004 longnguyen2004 longnguyen2004 approved these changes

@github-actions github-actions[bot] github-actions approved these changes

@NancyLi1013 NancyLi1013 NancyLi1013 approved these changes

@strega-nil-ms strega-nil-ms strega-nil-ms approved these changes

Assignees

@NancyLi1013 NancyLi1013

Labels
category:community-triplet A PR or issue related to community triplets not officially validated by the vcpkg team. category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@d12fk @NancyLi1013 @strega-nil-ms @longnguyen2004 @PhoebeHui @dg0yt @vicroms