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

depends: add cross arm64-darwin support #2775

Merged
merged 23 commits into from
Oct 2, 2024

Conversation

div72
Copy link
Member

@div72 div72 commented Sep 15, 2024

This PR adds arm64-darwin support for depends. Also removes the LLVM toolchain from the depends, a recent version of clang is now required for MacOS cross builds.

Updates libzip to 1.10.1. CMake is now required for depends. bzip2 is removed from depends.

CD output tested on a M1 Mac, starts without an issue.

@div72
Copy link
Member Author

div72 commented Sep 15, 2024

@jamescowens What are we building bzip2 in depends for?

@div72 div72 force-pushed the arm64-darwin-cross branch 2 times, most recently from 03618ae to cbba203 Compare September 16, 2024 11:54
@jamescowens
Copy link
Member

jamescowens commented Sep 16, 2024 via email

@div72 div72 force-pushed the arm64-darwin-cross branch from 0db7cbe to b04bd2a Compare September 16, 2024 12:12
@div72 div72 marked this pull request as ready for review September 16, 2024 12:22
@div72 div72 requested a review from jamescowens September 16, 2024 12:22
Copy link
Member

@jamescowens jamescowens left a comment

Choose a reason for hiding this comment

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

Looks ok to me. Can we get all of the CI jobs working before I merge this?

See bitcoin/bitcoin#22380. GNU flavor is used for the C standard as
OpenSSL have troubles building without it.
Needed for cross arm64-apple-darwin builds.
Needed now since FORCE_USE_SYSTEM_CLANG is removed and system clang is
mandatory.
See bitcoin/bitcoin#7f5ac4520d1553170b1053a9ffcd58179386a6d2.
Fixes an issue with Clang 18.
Needed for recognizing the `arm64-apple-darwin` triplet.
Needed since the current version cannot parse the `arm64-apple-darwin`
triplet.
Allows upgrading libzip. Adding CMake as a dependency is inevitable as
both upstream and Qt6 uses CMake as their build system.
The configure in the tarball does not recognize `arm64-apple-darwin`,
re-generation fixes that.
@div72 div72 force-pushed the arm64-darwin-cross branch from b04bd2a to d046727 Compare September 23, 2024 17:53
@div72
Copy link
Member Author

div72 commented Sep 23, 2024

Just rebased, all green now.

Copy link
Member

@jamescowens jamescowens left a comment

Choose a reason for hiding this comment

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

ACK

@jamescowens jamescowens merged commit 526d71d into gridcoin-community:development Oct 2, 2024
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants