guix: use GCC 11 in macOS build env#29673
Merged
fanquake merged 1 commit intobitcoin:masterfrom Apr 4, 2024
Merged
Conversation
Contributor
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. Code CoverageFor detailed information about the code coverage, see the test coverage report. ReviewsSee the guideline for information on the review process.
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update. ConflictsReviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first. |
Contributor
Note that this is just the native compiler, that is used to build the toolchain we use to build the actual binaries. Partially motivated by 29091.
fanquake
force-pushed
the
macos_guix_native_11
branch
from
eb85585 to
73d9230
Compare
Member
|
My Guix builds: |
hebasto
approved these changes
Mar 21, 2024
Member
Author
|
Guix Build (aarch64): 5dc5f4d98091401e3ab3548a194419cd29f1cf7d581a8c568257bfddfcef56e0 guix-build-73d92309d7c3/output/aarch64-linux-gnu/SHA256SUMS.part
f6c6fa035f323afcdbff22ffaa0e2c8428308a59ef09dd5f0da477e026cce477 guix-build-73d92309d7c3/output/aarch64-linux-gnu/bitcoin-73d92309d7c3-aarch64-linux-gnu-debug.tar.gz
e4020db912c0ef92d6cc17ead7f658c8d8448d2c58c29c4f67325e7100c74fd7 guix-build-73d92309d7c3/output/aarch64-linux-gnu/bitcoin-73d92309d7c3-aarch64-linux-gnu.tar.gz
138ecb54e64ddfce8c0f2eec9aea233f37511fd56d5dc138f16bcda26a01835d guix-build-73d92309d7c3/output/arm-linux-gnueabihf/SHA256SUMS.part
91aa64fa46c42e03d6e225f947068a257b0db560c66017c62a654fc8b05ac8dd guix-build-73d92309d7c3/output/arm-linux-gnueabihf/bitcoin-73d92309d7c3-arm-linux-gnueabihf-debug.tar.gz
bcd3f1d60dfd6129f54da9fdab99dfc611e1b76d49e00768188092cb17802be3 guix-build-73d92309d7c3/output/arm-linux-gnueabihf/bitcoin-73d92309d7c3-arm-linux-gnueabihf.tar.gz
063cd3926863e7ec5a675225f75e7aad2695795bb7137a8479a1a78b29e8affd guix-build-73d92309d7c3/output/arm64-apple-darwin/SHA256SUMS.part
ade548c858c363b80452f9808261f898fa0ee54d17062bfe3b4678b4117ea0b4 guix-build-73d92309d7c3/output/arm64-apple-darwin/bitcoin-73d92309d7c3-arm64-apple-darwin-unsigned.tar.gz
925edf4533c8b0d749aa31a7fe389e27ac16b2d48bb336d74ff9d8bfde92133e guix-build-73d92309d7c3/output/arm64-apple-darwin/bitcoin-73d92309d7c3-arm64-apple-darwin-unsigned.zip
d914f0c6f6ffe69befea0cd41c311a56d843f658e6ef60424efee4b236c92bda guix-build-73d92309d7c3/output/arm64-apple-darwin/bitcoin-73d92309d7c3-arm64-apple-darwin.tar.gz
7fcc656a8c84e88deafc476b51d60b775e3ad2e46d173824c9a6c194f9002cce guix-build-73d92309d7c3/output/dist-archive/bitcoin-73d92309d7c3.tar.gz
eb9ec168110d3a2fe2d0e518d51617352d480f757406f06201a0abac5fdf4ea5 guix-build-73d92309d7c3/output/powerpc64-linux-gnu/SHA256SUMS.part
4b212acb6d2fe94eae6db890c2600d1a2512aafe52d468c4ba5753db2f219e6c guix-build-73d92309d7c3/output/powerpc64-linux-gnu/bitcoin-73d92309d7c3-powerpc64-linux-gnu-debug.tar.gz
f343165941ff97bb58b68e6a23058f8927d81ce0c6d79853b7e20099aa06b18b guix-build-73d92309d7c3/output/powerpc64-linux-gnu/bitcoin-73d92309d7c3-powerpc64-linux-gnu.tar.gz
9a8452d3eb3bd00cdd921f3f38c317932ef23ef9a887a299772576d51a756157 guix-build-73d92309d7c3/output/riscv64-linux-gnu/SHA256SUMS.part
f7b35f8eaa7c178ffdbc2e203c9670fb77098ecf67827d615e0e3651ee3abb49 guix-build-73d92309d7c3/output/riscv64-linux-gnu/bitcoin-73d92309d7c3-riscv64-linux-gnu-debug.tar.gz
9f088b8ca6614342ebdde7885646f8873ffc7e9526485c7c205ef2f915a5fa3b guix-build-73d92309d7c3/output/riscv64-linux-gnu/bitcoin-73d92309d7c3-riscv64-linux-gnu.tar.gz
eb29991573dad7cf0d7ee8243299cb07b836d923cc2b3eb47e1e5951b4d814ce guix-build-73d92309d7c3/output/x86_64-apple-darwin/SHA256SUMS.part
517a48e3ab1a33923f628f160bdbcbc4ad7b5a80f0c1c5a556759b610670e389 guix-build-73d92309d7c3/output/x86_64-apple-darwin/bitcoin-73d92309d7c3-x86_64-apple-darwin-unsigned.tar.gz
417ca635f7f857555c954a73727489473edda7f59bc3478e99b7c8648a8d00a8 guix-build-73d92309d7c3/output/x86_64-apple-darwin/bitcoin-73d92309d7c3-x86_64-apple-darwin-unsigned.zip
7936051f957b1df55dc91a81817df45e20062b41610d17c40c92750bc5599082 guix-build-73d92309d7c3/output/x86_64-apple-darwin/bitcoin-73d92309d7c3-x86_64-apple-darwin.tar.gz
b7d923840cc7b164d298ad5bdd273c500b490e9eb3101ac1a3fa81b6874431e9 guix-build-73d92309d7c3/output/x86_64-linux-gnu/SHA256SUMS.part
3d287e8477c1981f63a314e50ab7a7f3e3f3eb974136946a85d808fcaf9c8e84 guix-build-73d92309d7c3/output/x86_64-linux-gnu/bitcoin-73d92309d7c3-x86_64-linux-gnu-debug.tar.gz
40e2993bea13e4fdad3d9ea95c31502e51a833962db4cf00265a1f85e19bdb82 guix-build-73d92309d7c3/output/x86_64-linux-gnu/bitcoin-73d92309d7c3-x86_64-linux-gnu.tar.gz
e190b732ffcb3304855b037422b649aba123b1629c67a75caeb9a7a1aecd52fd guix-build-73d92309d7c3/output/x86_64-w64-mingw32/SHA256SUMS.part
b2cd9008ae4f5707c181891cd1ff47c051a0e9ecc1841a75e29381fab4912ef3 guix-build-73d92309d7c3/output/x86_64-w64-mingw32/bitcoin-73d92309d7c3-win64-debug.zip
dd7d81268d245f5b60d885e761c76ca24b33496aac79cde671a43383de0ffaaf guix-build-73d92309d7c3/output/x86_64-w64-mingw32/bitcoin-73d92309d7c3-win64-setup-unsigned.exe
4022cd6f879c27894440aece1e094aad69167ebd95627889a683b5e1a7faf1f0 guix-build-73d92309d7c3/output/x86_64-w64-mingw32/bitcoin-73d92309d7c3-win64-unsigned.tar.gz
6dd3fda16b79eca9810ee343e52a99fe30ce3a1755ebd91e7881c821b7e13398 guix-build-73d92309d7c3/output/x86_64-w64-mingw32/bitcoin-73d92309d7c3-win64.zip |
Contributor
|
Pttn
added a commit
to RiecoinTeam/Riecoin
that referenced
this pull request
Apr 13, 2024
fanquake
added a commit
that referenced
this pull request
Apr 17, 2024
05da246 guix: remove gcc-toolchain static from Windows build (fanquake) Pull request description: The libs in this dir are the following: ```bash ls /gnu/store/2vnbkrdin4rrf7ygnr80mlcglin4qqa4-gcc-toolchain-12.3.0-static/lib/ libanl.a libc.a libdl.a libm.a libBrokenLocale.a libcrypt.a libg.a libmcheck.a libpthread.a librt.a libresolv.a libutil.a ``` These do not need to be propogated into the Windows build environment. Guix Build (aarch64): ```bash 450c0c4f45f9cb7ed7fc2ef6e7557b6a23004b82c951399da3b7635e8451a076 guix-build-05da2460db89/output/dist-archive/bitcoin-05da2460db89.tar.gz 5df68ab18636090c387bc90297356d0e148b02931d3a99c0f6d33cd268aa072b guix-build-05da2460db89/output/x86_64-w64-mingw32/SHA256SUMS.part 13e979f60d9296aa11081fbbb360404da9fbb797bb4663ed2d1189d800659b4f guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64-debug.zip d1cc78437a96f012a59af7c757bef592f163559e523d45014d7804d0be29a8b8 guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64-setup-unsigned.exe 33a9cfd4475677646bb32c9c45c25bd796ca5adb126590bf556d4e6f9592c676 guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64-unsigned.tar.gz 5d2ee251668d3d31bf378826ab06f98542dd20926cdee2df5c3315e11222a519 guix-build-05da2460db89/output/x86_64-w64-mingw32/bitcoin-05da2460db89-win64.zip ``` Somewhat similar to #29673. ACKs for top commit: laanwj: ACK 05da246 hebasto: ACK 05da246, Tree-SHA512: bf514a726a22e2bfae4de645b10d90a66fe090971340c4299aeb9b2ff9cf536ca6cfed274d312ea5d5a172775cbda6db0e609492ec603f5aee55c8de81462cc0
kwvg
added a commit
to kwvg/dash
that referenced
this pull request
Nov 10, 2024
PastaPastaPasta
added a commit
to dashpay/dash
that referenced
this pull request
Nov 12, 2024
, bitcoin#28786, bitcoin#29078, bitcoin#27897, bitcoin#29651, bitcoin#29695, bitcoin#29673, bitcoin#29828, bitcoin#29846, bitcoin#30231, bitcoin#30438, partial bitcoin#30511 (guix backports: part 5) 91b7ef8 merge bitcoin#30438: build Linux GCC with --enable-cet (Kittywhiskers Van Gogh) cfc6cba partial bitcoin#30511: GCC 12 consolidation (Kittywhiskers Van Gogh) 06f5431 merge bitcoin#30231: bump time-machine to f0bb724211872cd6158fce6162e0b8c73efed126 (Kittywhiskers Van Gogh) 5b292ee merge bitcoin#29846: replace GCC unaligned VMOV patch with binutils patch (Kittywhiskers Van Gogh) 4d1f7dc merge bitcoin#29828: remove `gcc-toolchain static` from Windows build (Kittywhiskers Van Gogh) f321d3d merge bitcoin#29673: use GCC 11 in macOS build env (Kittywhiskers Van Gogh) d570e2d merge bitcoin#29695: build GCC with --enable-standard-branch-protection (Kittywhiskers Van Gogh) c965943 merge bitcoin#29651: bump time-machine to dc4842797bfdc5f9f3f5f725bf189c2b68bd6b5a (Kittywhiskers Van Gogh) 59a125a merge bitcoin#27897: use GCC 12.3.0 to build releases (Kittywhiskers Van Gogh) a701b06 merge bitcoin#29078: Bump guix time-machine to unlock riscv64 metal (Kittywhiskers Van Gogh) d4b10a3 merge bitcoin#28786: switch to 6.1 kernel headers over 5.15 (Kittywhiskers Van Gogh) c371870 merge bitcoin#28580: update time-machine (Kittywhiskers Van Gogh) d36c9b6 merge bitcoin#28759: update signapple to latest master (Kittywhiskers Van Gogh) 38c71d8 merge bitcoin#28370: remove GCC 10 workaround from NSIS (Kittywhiskers Van Gogh) Pull request description: ## Additional Information * Dependent on #6382 * Dependency for #6384 ## Breaking Changes None expected ## Checklist - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests **(note: N/A)** - [x] I have made corresponding changes to the documentation **(note: N/A)** - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK 91b7ef8 Tree-SHA512: 0cfb436a430cf4b624a48a9928ecac9cd5c50e88e51ed04e7d1d0100968af8be1183364f035ac75153781a5e1616aa2f6fadabf0a1c03ec4b66dedea544b77ad
Fabcien
pushed a commit
to Bitcoin-ABC/bitcoin-abc
that referenced
this pull request
Nov 29, 2024
Summary: ``` Note that this is just the native compiler, that is used to build the toolchain we use to build the actual binaries. ``` Backport of [[bitcoin/bitcoin#29673 | core#29673]]. Depends on D17233. Test Plan: Run the OSX guix build. Reviewers: #bitcoin_abc, PiRK Reviewed By: #bitcoin_abc, PiRK Differential Revision: https://reviews.bitcoinabc.org/D17234
roqqit
pushed a commit
to doged-io/doged
that referenced
this pull request
Dec 2, 2024
Summary: ``` Note that this is just the native compiler, that is used to build the toolchain we use to build the actual binaries. ``` Backport of [[bitcoin/bitcoin#29673 | core#29673]]. Depends on D17233. Test Plan: Run the OSX guix build. Reviewers: #bitcoin_abc, PiRK Reviewed By: #bitcoin_abc, PiRK Differential Revision: https://reviews.bitcoinabc.org/D17234
knst
added a commit
to knst/dash
that referenced
this pull request
Dec 26, 2024
, bitcoin#28580, bitcoin#28786, bitcoin#29078, bitcoin#27897, bitcoin#29651, bitcoin#29695, bitcoin#29673, bitcoin#29828, bitcoin#29846, bitcoin#30231, bitcoin#30438, partial bitcoin#30511 (guix backports: part 5)" This reverts commit be97bfe, reversing changes made to f155ecf.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Note that this is just the native compiler, which is used to build the toolchain we use to build the actual binaries.
Partially motivated by #29091, where it could now be a bit confusing if we are explicitly using GCC 10 in our release toolchain, when our minimum required is 11 (this can't be bumped to 12 due to build issues with native tools).
At the same time, remove
gcc-toolchain "static"from the macOS build env.