Skip to content

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
jamescowens added a commit that referenced this pull request Feb 16, 2025
Added
 - depends: add cross arm64-darwin support #2775 (@div72)
 - build: add missing randomness checks #2772 (@div72)
 - init, registry: Support -clearallregistryhistory startup parameter #2773 (@jamescowens)

Changed
 - build: omit _FORTIFY_SOURCE on debug #2793 (@div72)
 - doc: cmake is required for Windows depends #2791 (@barton2526)
 - CMake: Set maximum supported Boost version #2788 (@CyberTailor)
 - ci: bump to MacOS 13 #2784 (@div72)
 - build/cmake: disable LevelDB tests #2776 (@div72)
 - util: use XDG_STATE_HOME for datadir on Flatpak #2774 (@div72)
 - util, build: Support miniupnp API version 18+ #2771 (@jamescowens)
 - build: explicitly include FindPkgConfig for CMake #2769 (@jamescowens)
 - ci, cd: bump action versions #2763 (@div72)
 - Sync CMake CI #2762 (@CyberTailor)
 - cpid: Modify CPID local hasher to eliminate compiler warnings on 32 bit archs #2760 (@jamescowens)

Removed
 - refactor, misc: remove CBitcoin(Address|Secret) #2634 (@div72)

Fixed
 - poll, gui: Disable choice add button in poll wizard when choice limit is reached #2792 (@jamescowens)
 - diagnose, rpc: fix compilation with boost 1.87 #2786 (@div72)
 - node: fix build with GCC 15 #2783 (@CyberTailor)
 - ci: use overwrite with brew install on MacOS CMake #2782 (@div72)
 - scraper: Protect access to ConvergedStats.csv.gz with a lock #2779 (@jamescowens)
 - fix build on FreeBSD #2770 (@wilkart)
 - rpc/server: fix removing deprecated commands from command list #2768 (@lrusak)
 - cmake bdb53: disable error for implicit-int with gcc #2767 (@lrusak)
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