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

[libmysql] Fix port on arm64-osx (compiler checks) #35930

Merged
merged 4 commits into from
Jan 5, 2024
Merged

[libmysql] Fix port on arm64-osx (compiler checks) #35930

merged 4 commits into from
Jan 5, 2024

Conversation

MaxRev-Dev
Copy link
Contributor

FIxes #35876

  • 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.

@MaxRev-Dev
Copy link
Contributor Author

@microsoft-github-policy-service agree

dg0yt
dg0yt reviewed Dec 30, 2023
View reviewed changes
ports/libmysql/compiler-check.patch Outdated
Comment on lines 9 to 13
- CHECK_C_SOURCE_RUNS("
- int main()
- {
- return (__clang_major__ < 10);
- }" HAVE_SUPPORTED_CLANG_VERSION)
Copy link
Contributor

Choose a reason for hiding this comment

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

IMO either this should become part of cross-build.patch (because check_c_source_runs is a cross-build blocker), or we simply add -DFORCE_UNSUPPORTED_COMPILER=1 to the cmake options.
(Sidenote: Is the XCode version equal to __clang_major__?)

Copy link
Contributor Author

@MaxRev-Dev MaxRev-Dev Dec 30, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Not sure how to modify it. Are you suggesting to keep it? It doesn't work for me as expected - HAVE_SUPPORTED_CLANG_VERSION is empty after the function executes.
But the HAVE_SUPPORTED_CLANG_VERSION_COMPILED is set to true.
Regarding __clang_major__, it's equal to XCode version (according to wiki). The conditional I'm suggesting using CMAKE_CXX_COMPILER_VERSION works the same way.

@Cheney-W Cheney-W changed the title Fix libmysql on arm64-osx (compiler checks) [libmysql] Fix port on arm64-osx (compiler checks) Jan 2, 2024
@Cheney-W Cheney-W added category:port-bug The issue is with a library, which is something the port should already support category:community-triplet A PR or issue related to community triplets not officially validated by the vcpkg team. labels Jan 2, 2024
@Cheney-W
Copy link
Contributor

Cheney-W commented Jan 2, 2024

8.0.34#1 is declared with 20cb416a4659c1f3d6cbf08fef69ebf51eb8e15c, but the local port has a different SHA 167e024cc411a99094f62e58913991caca22237f.
Please update the port's version fields and then run:

vcpkg x-add-version libmysql --overwrite-version
git add .
git commit -m "Update version database"

to add the new version.

@Cheney-W Cheney-W marked this pull request as draft January 2, 2024 07:46
@MaxRev-Dev
Copy link
Contributor Author

@Cheney-W done, thanks. The 8.0.34#1 was not released yet. I updated the database during the checks in the previous commit, but the hash diverged somehow.

@MaxRev-Dev MaxRev-Dev requested a review from dg0yt January 3, 2024 17:33
@MaxRev-Dev MaxRev-Dev marked this pull request as ready for review January 3, 2024 17:34
dg0yt
dg0yt approved these changes Jan 3, 2024
View reviewed changes
Copy link
Contributor

@dg0yt dg0yt left a comment

Choose a reason for hiding this comment

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

LGTM but someone else must approve.

Cheney-W
Cheney-W previously approved these changes Jan 4, 2024
View reviewed changes
@Cheney-W Cheney-W added the info:reviewed Pull Request changes follow basic guidelines label Jan 4, 2024
BillyONeal
BillyONeal approved these changes Jan 5, 2024
View reviewed changes
Copy link
Member

@BillyONeal BillyONeal left a comment

Choose a reason for hiding this comment

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

Will merge when build comes back

@BillyONeal BillyONeal merged commit fc3f613 into microsoft:master Jan 5, 2024
15 checks passed
@MaxRev-Dev MaxRev-Dev deleted the libmysql-patch-arm64-osx branch January 5, 2024 16:53
Osyotr pushed a commit to Osyotr/vcpkg that referenced this pull request Jan 23, 2024
@MaxRev-Dev @Osyotr
[libmysql] Fix port on arm64-osx (compiler checks) (microsoft#35930)
7744d47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BillyONeal BillyONeal BillyONeal approved these changes

@dg0yt dg0yt dg0yt approved these changes

@Cheney-W Cheney-W Cheney-W left review comments

Assignees

@Cheney-W Cheney-W

Labels
category:community-triplet A PR or issue related to community triplets not officially validated by the vcpkg team. category:port-bug The issue is with a library, which is something the port should already support info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[libmysql] Build error on arm64-osx-dynamic
4 participants
@MaxRev-Dev @Cheney-W @BillyONeal @dg0yt