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

scripts/msys => scripts/cmake #32375

Merged
merged 4 commits into from
Jul 27, 2023
Merged

Conversation

BillyONeal
Copy link
Member

@BillyONeal BillyONeal commented Jul 3, 2023

The "msys" directory looked like a "maintainer help" directory (like scripts/boost is) so it wasn't included in standalone distributions of vcpkg.

It seems like the correct fix for this is just to move it into the scripts/cmake directory.

Fixes: #31565

The "msys" directory looked like a "maintainer help" directory (like scripts/boost is) so it wasn't included in standalone distributions of vcpkg.

It seems like the correct fix for this is just to move it into the scripts/cmake directory.
@BillyONeal BillyONeal added category:vcpkg-bug The issue is with the vcpkg system (including helper scripts in `scripts/cmake/`) info:internal This PR or Issue was filed by the vcpkg team. labels Jul 3, 2023
@@ -283,7 +283,7 @@ macro(z_vcpkg_acquire_msys_declare_all_packages)
URL "https://mirror.msys2.org/msys/x86_64/automake1.16-1.16.5-1-any.pkg.tar.zst"
SHA512 62c9dfe28d6f1d60310f49319723862d29fc1a49f7be82513a4bf1e2187ecd4023086faf9914ddb6701c7c1e066ac852c0209db2c058f3865910035372a4840a
DEPS bash perl
PATCHES "${SCRIPTS}/msys/compile_wrapper_consider_clang-cl.patch"
PATCHES "${CMAKE_CURRENT_LIST_DIR}/compile_wrapper_consider_clang-cl.patch"
Copy link
Contributor

Choose a reason for hiding this comment

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

can this please be moved into a subfolder? to separate patches and scripts ?

Copy link
Member Author

Choose a reason for hiding this comment

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

What do we gain by separating those?

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm going to merge as is for now but if there are many many patches in the future we can always move it again.

@dg0yt
Copy link
Contributor

dg0yt commented Jul 3, 2023

Issue: #31565

@BillyONeal BillyONeal merged commit 08f00b4 into microsoft:master Jul 27, 2023
@MonicaLiu0311 MonicaLiu0311 added the info:reviewed Pull Request changes follow basic guidelines label Jul 28, 2023
@BillyONeal BillyONeal deleted the move-msys-patch branch September 15, 2023 22:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:vcpkg-bug The issue is with the vcpkg system (including helper scripts in `scripts/cmake/`) info:internal This PR or Issue was filed by the vcpkg team. info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
4 participants