depends: cctools 986, ld64 711 & libtapi 1300.0.6.5 #28422
Merged
Conversation
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
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. 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. |
|
Guix builds: |
|
Guix build (same on both aarch64 and x86_64 hosts): |
TheCharlatan
approved these changes
Sep 7, 2023
hebasto
reviewed
Sep 7, 2023
| @@ -18,15 +17,9 @@ endef | |||
| ifneq ($(strip $(FORCE_USE_SYSTEM_CLANG)),) | |||
| define $(package)_preprocess_cmds | |||
| mkdir -p $($(package)_staging_prefix_dir)/lib && \ | |||
| cp $(llvm_lib_dir)/libLTO.so $($(package)_staging_prefix_dir)/lib/ && \ | |||
| cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub cctools && \ | |||
There was a problem hiding this comment.
Why this line removed? I understand that it works now without it, but:
- there were related problems in the past, for example build: use newer config.guess & config.sub in depends #22526
- this change is unrelated to the PR topic and omitted in the PR description
There was a problem hiding this comment.
The new source has a newer config.guess and config.sub, which has the arm triple we need.
there were related problems in the past,
Ok? However the triple isn't going to be removed in the future, so I'm not sure what your point is.
this change is unrelated to the PR topic and omitted in the PR description
How is it unrelated? Now that we are using newer sources, we don't need to copy over additional files.
There was a problem hiding this comment.
Also, all of this code is going to be deleted in the near future in any case (#21778). The only reason it's being updated now is to avoid an awkward split in the GCC toolchains used in the Guix builds, otherwise, we'd avoid bumping it again.
hebasto
approved these changes
Sep 7, 2023
There was a problem hiding this comment.
ACK 7d58152
Guix builds:
x86_64
27d43a97ea6c4ed2e84d9a9dd6c240e8e199174f4491ee1fb62abb1d950a96bd guix-build-7d5815293ed8/output/arm64-apple-darwin/SHA256SUMS.part
029347186cc55c15152e8c255493ed457e58127ffa536982f3a632fc416b6662 guix-build-7d5815293ed8/output/arm64-apple-darwin/bitcoin-7d5815293ed8-arm64-apple-darwin-unsigned.dmg
791399447c33f7d3ed4d77fd22fde69aa7c87adda9291fca9508237b69b05b80 guix-build-7d5815293ed8/output/arm64-apple-darwin/bitcoin-7d5815293ed8-arm64-apple-darwin-unsigned.tar.gz
b9c72b7f37068889a83384598b6de97c8e39e7a097b661152084a5e69236541d guix-build-7d5815293ed8/output/arm64-apple-darwin/bitcoin-7d5815293ed8-arm64-apple-darwin.tar.gz
6a249cc6d02d7398b9ed70b251422bf4bb1c2acdaafb5a885870e8ef20d43a89 guix-build-7d5815293ed8/output/dist-archive/bitcoin-7d5815293ed8.tar.gz
6172224f94d52eb22a3749b1e3c0639476dfdaff47d15c6a8ec3e6dbf8763f9b guix-build-7d5815293ed8/output/x86_64-apple-darwin/SHA256SUMS.part
f59f68ad4783ff1ecb09cd84f15bbfc803c856971de5a131fbb1777cf8f1b79a guix-build-7d5815293ed8/output/x86_64-apple-darwin/bitcoin-7d5815293ed8-x86_64-apple-darwin-unsigned.dmg
ac31df20d1e5f3a73aadb5455e804af053b179ca6471b5a57afe3c7df0f09128 guix-build-7d5815293ed8/output/x86_64-apple-darwin/bitcoin-7d5815293ed8-x86_64-apple-darwin-unsigned.tar.gz
a33f661386d415f621ab17edf7fe3efa61f0c2b0c3003fecd4f5f6898129992d guix-build-7d5815293ed8/output/x86_64-apple-darwin/bitcoin-7d5815293ed8-x86_64-apple-darwin.tar.gz
Frank-GER
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Sep 8, 2023
7d58152 depends: cctools 986 & ld64 711 (fanquake) 1ed1183 depends: libtapi 1300.0.6.5 (fanquake) Pull request description: Update [libtapi to `1300.0.6.5`](https://github.com/tpoechtrager/apple-libtapi/tree/1300.6.5), [cctools to `986` & ld64 to `711`](https://github.com/tpoechtrager/cctools-port/commits/986-ld64-711). Updating these dependencies fixes the macOS build failures in bitcoin#27897, when using a native GCC 12 toolchain, which means after this change, we can use use GCC 12 for all HOSTS, rather than splitting between 12 & 10 (for macOS). Guix Build (x86_64): ```bash a684a3e7668250610d653e5160115fb50b477339423335b185bd4716c8420e14 guix-build-7d5815293ed8/output/aarch64-linux-gnu/SHA256SUMS.part 9c66b82e2c5b6dbdcabdd962481485f71af5770e8bb573eaefb55d45e85e2875 guix-build-7d5815293ed8/output/aarch64-linux-gnu/bitcoin-7d5815293ed8-aarch64-linux-gnu-debug.tar.gz 63f82714a93e7a3c0e922cdcce7d3b27789d63cdf136dc3a71b74d61b0910ce8 guix-build-7d5815293ed8/output/aarch64-linux-gnu/bitcoin-7d5815293ed8-aarch64-linux-gnu.tar.gz dcc79295462e0f585753959247ec02b273f5a933fadc5d528c266d56bbdaaf44 guix-build-7d5815293ed8/output/arm-linux-gnueabihf/SHA256SUMS.part 044fc0ad2a8615dd004579b5003fa981ebc4e3bfaacf5eba8a33cea02a9ba518 guix-build-7d5815293ed8/output/arm-linux-gnueabihf/bitcoin-7d5815293ed8-arm-linux-gnueabihf-debug.tar.gz a032899be14fa2987dfd5a21865567d3beea703e778a2f91ec17eddb099d0c46 guix-build-7d5815293ed8/output/arm-linux-gnueabihf/bitcoin-7d5815293ed8-arm-linux-gnueabihf.tar.gz 27d43a97ea6c4ed2e84d9a9dd6c240e8e199174f4491ee1fb62abb1d950a96bd guix-build-7d5815293ed8/output/arm64-apple-darwin/SHA256SUMS.part 029347186cc55c15152e8c255493ed457e58127ffa536982f3a632fc416b6662 guix-build-7d5815293ed8/output/arm64-apple-darwin/bitcoin-7d5815293ed8-arm64-apple-darwin-unsigned.dmg 791399447c33f7d3ed4d77fd22fde69aa7c87adda9291fca9508237b69b05b80 guix-build-7d5815293ed8/output/arm64-apple-darwin/bitcoin-7d5815293ed8-arm64-apple-darwin-unsigned.tar.gz b9c72b7f37068889a83384598b6de97c8e39e7a097b661152084a5e69236541d guix-build-7d5815293ed8/output/arm64-apple-darwin/bitcoin-7d5815293ed8-arm64-apple-darwin.tar.gz 6a249cc6d02d7398b9ed70b251422bf4bb1c2acdaafb5a885870e8ef20d43a89 guix-build-7d5815293ed8/output/dist-archive/bitcoin-7d5815293ed8.tar.gz 064e5e0df21aa177eaf8d67254ad5166b190559f69da68d34174a323d8c975c6 guix-build-7d5815293ed8/output/powerpc64-linux-gnu/SHA256SUMS.part 6aee00585bdd680d42f3341df523b7173dc06defa8f51f98af38c8518ddf4532 guix-build-7d5815293ed8/output/powerpc64-linux-gnu/bitcoin-7d5815293ed8-powerpc64-linux-gnu-debug.tar.gz d6e51b521c84276d5c9606a96ee36b94bc235370064cf75148d15d3a4011ed9d guix-build-7d5815293ed8/output/powerpc64-linux-gnu/bitcoin-7d5815293ed8-powerpc64-linux-gnu.tar.gz e0a133afe0e0e7894d3c6110b7b1895efff8f45abbe473d95100d3c5615dc855 guix-build-7d5815293ed8/output/powerpc64le-linux-gnu/SHA256SUMS.part 8d62884b81fca76720284ae4d5b2a0d0ebfcbcf533d9936c8aa8ab04739540e9 guix-build-7d5815293ed8/output/powerpc64le-linux-gnu/bitcoin-7d5815293ed8-powerpc64le-linux-gnu-debug.tar.gz c4c90dd3c83a84aa074ab5dc77b82fd2a26d872547037ef2a8a2d11abba1db98 guix-build-7d5815293ed8/output/powerpc64le-linux-gnu/bitcoin-7d5815293ed8-powerpc64le-linux-gnu.tar.gz dd28d196e89f74cf7666b347e1cbdd16eb90bfe0d5b054ac2edbf0e4f755bd9a guix-build-7d5815293ed8/output/riscv64-linux-gnu/SHA256SUMS.part 8d3ace8a17d4c1a13786adb3669b1d929485b164c59efb1fe7cf8fe3aad90f73 guix-build-7d5815293ed8/output/riscv64-linux-gnu/bitcoin-7d5815293ed8-riscv64-linux-gnu-debug.tar.gz bf530b7944dfdd9ffd03b2be541fa349e8598cb39ee5e1bd4be0b5b48bdfcc31 guix-build-7d5815293ed8/output/riscv64-linux-gnu/bitcoin-7d5815293ed8-riscv64-linux-gnu.tar.gz 6172224f94d52eb22a3749b1e3c0639476dfdaff47d15c6a8ec3e6dbf8763f9b guix-build-7d5815293ed8/output/x86_64-apple-darwin/SHA256SUMS.part f59f68ad4783ff1ecb09cd84f15bbfc803c856971de5a131fbb1777cf8f1b79a guix-build-7d5815293ed8/output/x86_64-apple-darwin/bitcoin-7d5815293ed8-x86_64-apple-darwin-unsigned.dmg ac31df20d1e5f3a73aadb5455e804af053b179ca6471b5a57afe3c7df0f09128 guix-build-7d5815293ed8/output/x86_64-apple-darwin/bitcoin-7d5815293ed8-x86_64-apple-darwin-unsigned.tar.gz a33f661386d415f621ab17edf7fe3efa61f0c2b0c3003fecd4f5f6898129992d guix-build-7d5815293ed8/output/x86_64-apple-darwin/bitcoin-7d5815293ed8-x86_64-apple-darwin.tar.gz 03104057b86de994258587ff5a8de16f48354a7493527e5bb2559714c0e2bf39 guix-build-7d5815293ed8/output/x86_64-linux-gnu/SHA256SUMS.part a9c3f233629038978b9fa11c1353b4e686406851c0e84a5539cf3bc90722d98b guix-build-7d5815293ed8/output/x86_64-linux-gnu/bitcoin-7d5815293ed8-x86_64-linux-gnu-debug.tar.gz 61db7ec4aa306a6f79628b217c05387b69002d123fcf07d6784cce03d9a8574d guix-build-7d5815293ed8/output/x86_64-linux-gnu/bitcoin-7d5815293ed8-x86_64-linux-gnu.tar.gz 7f5b42d02d8c026492376b644a94a45613155a0ccc1d3ef9f067b3370d45c4d2 guix-build-7d5815293ed8/output/x86_64-w64-mingw32/SHA256SUMS.part de23de0fb32c77f9ff91ffe554347c7ddc77fae22212d0e609389b4b7a1d6e29 guix-build-7d5815293ed8/output/x86_64-w64-mingw32/bitcoin-7d5815293ed8-win64-debug.zip 2131ce905aa3452883a9f47b6618506a6cb90c2a1725818084bc4e08856ff8d3 guix-build-7d5815293ed8/output/x86_64-w64-mingw32/bitcoin-7d5815293ed8-win64-setup-unsigned.exe 5555d28d9ea14a50ab296c2b1f1db7f7acde933009334999b6be29a2ed469bc0 guix-build-7d5815293ed8/output/x86_64-w64-mingw32/bitcoin-7d5815293ed8-win64-unsigned.tar.gz 7dc29c317c140ae8a8f487d2d66761c3fae90a5521dd4bfd0d071adbfafb30ef guix-build-7d5815293ed8/output/x86_64-w64-mingw32/bitcoin-7d5815293ed8-win64.zip ``` ACKs for top commit: TheCharlatan: ACK 7d58152 hebasto: ACK 7d58152 Tree-SHA512: 98873733abb2ebc318129d9fa6627d39f751495776338f539bd58985d08246c1fb85d6bb9b5911f0cd692c26e519713b93d496ffbae513a45942357b82497a91
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Update libtapi to
1300.0.6.5, cctools to986& ld64 to711.Updating these dependencies fixes the macOS build failures in #27897, when using a native GCC 12 toolchain, which means after this change, we can use use GCC 12 for all HOSTS, rather than splitting between 12 & 10 (for macOS).
Guix Build (x86_64):