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.

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

[apr] Add HOST_TOOLS_DIR/gen_test_char for cross-compiling to Windows #41416

Merged

Conversation

WangWeiLin-MV
Copy link
Contributor

@WangWeiLin-MV WangWeiLin-MV commented Oct 8, 2024

Fix #40827, missing native tool gen_test_char on cross-compiling to Windows.

Change

For cross-compiling on Linux, see apache/apr#8

Checklist

  • Changes comply with the maintainer guide.
  • SHA512s are updated for each updated download.
  • The "supports" clause reflects platforms that may be fixed by this new version.
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

Test

The port usage tests pass on host x64-windows with the following triplets:

  • arm64-windows
  • x86-windows
  • x64-windows

@WangWeiLin-MV WangWeiLin-MV added category:port-bug The issue is with a library, which is something the port should already support info:internal This PR or Issue was filed by the vcpkg team. labels Oct 8, 2024
@WangWeiLin-MV WangWeiLin-MV marked this pull request as ready for review October 9, 2024 02:25
@LilyWangLL LilyWangLL added the info:reviewed Pull Request changes follow basic guidelines label Oct 10, 2024
Comment on lines +10 to +14
{
"name": "apr",
"host": true,
"platform": "windows"
},
Copy link
Contributor

Choose a reason for hiding this comment

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

I thought that this dependency was only needed on cross compiling? This would make it a host dependency even when not cross compiling.

Copy link
Contributor

Choose a reason for hiding this comment

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

This is the apr manifest. An apr host dependency is a no-op in the native case.

Copy link
Contributor

Choose a reason for hiding this comment

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

You're right @dg0yt, apologies for the confusion.

"description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.",
"license": "Apache-2.0",
"supports": "!(uwp | osx)",
"supports": "(windows & !uwp & (x86 | x64)) | (!windows & !osx)",
Copy link
Contributor

Choose a reason for hiding this comment

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

Are you trying to exclude arm on windows?

Copy link
Contributor Author

@WangWeiLin-MV WangWeiLin-MV Oct 12, 2024

Choose a reason for hiding this comment

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

Port activemq-cpp: Only allow x86 and x64 under Windows platform

Yes, only x86 x64 is provided in its sln file of the port activemq-cpp, and it previously was skipped by cascade in CI.

@JavierMatosD JavierMatosD marked this pull request as draft October 11, 2024 16:53
@LilyWangLL LilyWangLL removed the info:reviewed Pull Request changes follow basic guidelines label Oct 12, 2024
@WangWeiLin-MV WangWeiLin-MV marked this pull request as ready for review October 12, 2024 02:16
@LilyWangLL LilyWangLL added the info:reviewed Pull Request changes follow basic guidelines label Oct 16, 2024
@JavierMatosD JavierMatosD merged commit d121b49 into microsoft:master Oct 16, 2024
16 checks passed
@WangWeiLin-MV WangWeiLin-MV deleted the ports/apr/add-host-tools-dir branch October 17, 2024 02:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support info:internal This PR or Issue was filed by the vcpkg team. info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[apr] Build error with cross compile
4 participants