Skip to content

build: swap cctools otool for llvm-objdump #29739

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
Merged
merged 1 commit into from
May 11, 2024
Merged

build: swap cctools otool for llvm-objdump #29739

merged 1 commit into from
May 11, 2024

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Mar 26, 2024 •
edited
Loading

This tool is used in GUI packaging on macOS, and also somewhat of a blocker for #21778. The main issue is that some distros don't really ship this tool in a standard ways, i.e Ubuntu only ships llvm-otool with a version suffix, i.e llvm-otool-17, which makes it hard to find and use. Rather than trying to deal with that mess, switch to using the equivalent LLVM tool (objdump), which is a drop-in replacement.

@DrahtBot
Copy link
Contributor

DrahtBot commented Mar 26, 2024 •
edited
Loading

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage

For detailed information about the code coverage, see the test coverage report.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK theuni, TheCharlatan, hebasto

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

Conflicts

No conflicts as of last run.

@DrahtBot DrahtBot mentioned this pull request Mar 27, 2024
Merged
@fanquake fanquake force-pushed the swap_otool_llvm_objdump branch 2 times, most recently from 0ab1866 to 33a6392 Compare March 27, 2024 14:50
@Sjors
Copy link
Member

Sjors commented Apr 2, 2024 •
edited
Loading

Tested 33a6392 depends build on Intel macOS 13.6.6 as well as 14.4.1, including make deploy. Both work fine.

I did run into a confusing, but unrelated (happens on 28f2ca6 too, see #29792), failure with bdb, only on macOS 13.6.6:

---
Preprocessing bdb...
patching file 'dbinc/atomic.h'
Can't create '/var/folders/qp/bskkps293_v5w198m17h7zrm0000gn/T/patchoA5jhEiYaVC', output is in '/var/folders/qp/bskkps293_v5w198m17h7zrm0000gn/T/patchoA5jhEiYaVC': Permission denied
patch: **** can't create '/var/folders/qp/bskkps293_v5w198m17h7zrm0000gn/T/patchoA5jhEiYaVC': Permission denied
make: *** [/Volumes/SSD/Dev/bitcoin-depends/depends/work/build/x86_64-apple-darwin22.6.0/bdb/4.8.30-c415e5a6444/.stamp_preprocessed] Error 2
----

The folder /var/folders/qp/bskkps293_v5w198m17h7zrm0000gn/T/patchoA5jhEiYaVC already exists. If I delete it and run make again I get the same error, and it creates the folder again. I'm puzzled why it doesn't throw "File exists" instead.

On that machine I proceeded with NO_BDB=1, so only tested with sqlite.

CI seems unhappy for macOS cross:

FileNotFoundError: [Errno 2] No such file or directory: 'llvm-objdump'
make: *** [Makefile:1303: dist/Bitcoin-Qt.app/Contents/MacOS/Bitcoin-Qt] Error 1

@fanquake fanquake force-pushed the swap_otool_llvm_objdump branch from 33a6392 to 77eaee0 Compare April 5, 2024 09:05
@fanquake
Copy link
Member Author

fanquake commented Apr 5, 2024

I did run into a confusing, but unrelated (happens on 28f2ca6 too, see #29792), failure with bdb,

Yes that is unrelated.

CI seems unhappy for macOS cross:

Fixed up.

@DrahtBot DrahtBot removed the CI failed label Apr 5, 2024
@Sjors
Copy link
Member

Sjors commented Apr 5, 2024

Also tested the guix build (made on AMD Ubuntu) for 77eaee0 on macOS 14.4.1.

4fd8566ccc8229c4784eac5cc21d077b179b4165b457911fe142ea2e3b0069e7  guix-build-77eaee0ba46a/output/arm64-apple-darwin/SHA256SUMS.part
6cca0ae159eddbf88dd1858eec51625816346487fc5eb9e5260037c686e8e312  guix-build-77eaee0ba46a/output/arm64-apple-darwin/bitcoin-77eaee0ba46a-arm64-apple-darwin-unsigned.tar.gz
c967afbfd76efb0a16e54524734396e56afe249273620f59904253a8608d1416  guix-build-77eaee0ba46a/output/arm64-apple-darwin/bitcoin-77eaee0ba46a-arm64-apple-darwin-unsigned.zip
3d28e921e71106996348e8a483adc1e9e24441fa21455a74323e836a92b01588  guix-build-77eaee0ba46a/output/arm64-apple-darwin/bitcoin-77eaee0ba46a-arm64-apple-darwin.tar.gz
ea71bc724ce8214e97a226279b0c6eb4c392d401b1f3b8a126140467160e379a  guix-build-77eaee0ba46a/output/dist-archive/bitcoin-77eaee0ba46a.tar.gz
abe2a8abf88b59982b46f8e7012fa981adbacaf1b424877456754f1c1d331d23  guix-build-77eaee0ba46a/output/x86_64-apple-darwin/SHA256SUMS.part
172b34356fde06ee17a09218c169ae2e4a3c223534a123f9aa67a5f86bded8d2  guix-build-77eaee0ba46a/output/x86_64-apple-darwin/bitcoin-77eaee0ba46a-x86_64-apple-darwin-unsigned.tar.gz
8c3f82577227c0b7133873896c360faf194a4523bb8d9d1602bd97fef2a6beb9  guix-build-77eaee0ba46a/output/x86_64-apple-darwin/bitcoin-77eaee0ba46a-x86_64-apple-darwin-unsigned.zip
bae74b14820d06c7667278f320937e2f86a25ae0efc2d94b2a2c905c26c15b2e  guix-build-77eaee0ba46a/output/x86_64-apple-darwin/bitcoin-77eaee0ba46a-x86_64-apple-darwin.tar.gz

@fanquake
Copy link
Member Author

fanquake commented Apr 5, 2024

Guix Build (aarch64):

c39f93edbd44b97256834f1173f23c311a7f7fdf467ecebd4ec930e0691732ad  guix-build-77eaee0ba46a/output/aarch64-linux-gnu/SHA256SUMS.part
4e88994692636055e105346229ad87fcb40569a984fddb278e92b78498a983ef  guix-build-77eaee0ba46a/output/aarch64-linux-gnu/bitcoin-77eaee0ba46a-aarch64-linux-gnu-debug.tar.gz
f2d7c80d039ecfe9889eada5be4f701f413b22eb679511634a20545528b61a15  guix-build-77eaee0ba46a/output/aarch64-linux-gnu/bitcoin-77eaee0ba46a-aarch64-linux-gnu.tar.gz
df23e2877a33f7c7c2745949e64901c56322ec036407f9aac9525e06b2f7e9eb  guix-build-77eaee0ba46a/output/arm-linux-gnueabihf/SHA256SUMS.part
850d8edfba1b36b5e246300adfa8f725f6202db033078da6e30d38ec9da78c77  guix-build-77eaee0ba46a/output/arm-linux-gnueabihf/bitcoin-77eaee0ba46a-arm-linux-gnueabihf-debug.tar.gz
c4b27197411da1126837e8b25bf074f70c36caf1f9b54432d1e5eaa588a9df02  guix-build-77eaee0ba46a/output/arm-linux-gnueabihf/bitcoin-77eaee0ba46a-arm-linux-gnueabihf.tar.gz
4fd8566ccc8229c4784eac5cc21d077b179b4165b457911fe142ea2e3b0069e7  guix-build-77eaee0ba46a/output/arm64-apple-darwin/SHA256SUMS.part
6cca0ae159eddbf88dd1858eec51625816346487fc5eb9e5260037c686e8e312  guix-build-77eaee0ba46a/output/arm64-apple-darwin/bitcoin-77eaee0ba46a-arm64-apple-darwin-unsigned.tar.gz
c967afbfd76efb0a16e54524734396e56afe249273620f59904253a8608d1416  guix-build-77eaee0ba46a/output/arm64-apple-darwin/bitcoin-77eaee0ba46a-arm64-apple-darwin-unsigned.zip
3d28e921e71106996348e8a483adc1e9e24441fa21455a74323e836a92b01588  guix-build-77eaee0ba46a/output/arm64-apple-darwin/bitcoin-77eaee0ba46a-arm64-apple-darwin.tar.gz
ea71bc724ce8214e97a226279b0c6eb4c392d401b1f3b8a126140467160e379a  guix-build-77eaee0ba46a/output/dist-archive/bitcoin-77eaee0ba46a.tar.gz
4ba4b49a414cddf6da484762a91969a6e6ad9a055365118ac5cd2c4045b34bd8  guix-build-77eaee0ba46a/output/powerpc64-linux-gnu/SHA256SUMS.part
79ea63ee2018b020851f089d6c34d70a18c112af125ad12496df4ccf8942b235  guix-build-77eaee0ba46a/output/powerpc64-linux-gnu/bitcoin-77eaee0ba46a-powerpc64-linux-gnu-debug.tar.gz
a6d8ba0e924a743ae1a1b834afdee238957487f6cb5d56a67bd0c4452bf5c468  guix-build-77eaee0ba46a/output/powerpc64-linux-gnu/bitcoin-77eaee0ba46a-powerpc64-linux-gnu.tar.gz
db34798d4529aadd80ba8ccefbb70be637ba9a8ab8fbbb9485e205d3d6945c96  guix-build-77eaee0ba46a/output/riscv64-linux-gnu/SHA256SUMS.part
2127f321726156fa44022384bea4ca899f09b9c3986ff17910e306844ed77270  guix-build-77eaee0ba46a/output/riscv64-linux-gnu/bitcoin-77eaee0ba46a-riscv64-linux-gnu-debug.tar.gz
73d7f7b9db8eb35754463513448e5be6fbdea0b3dcbb9c213ebea0556fd3a3e4  guix-build-77eaee0ba46a/output/riscv64-linux-gnu/bitcoin-77eaee0ba46a-riscv64-linux-gnu.tar.gz
abe2a8abf88b59982b46f8e7012fa981adbacaf1b424877456754f1c1d331d23  guix-build-77eaee0ba46a/output/x86_64-apple-darwin/SHA256SUMS.part
172b34356fde06ee17a09218c169ae2e4a3c223534a123f9aa67a5f86bded8d2  guix-build-77eaee0ba46a/output/x86_64-apple-darwin/bitcoin-77eaee0ba46a-x86_64-apple-darwin-unsigned.tar.gz
8c3f82577227c0b7133873896c360faf194a4523bb8d9d1602bd97fef2a6beb9  guix-build-77eaee0ba46a/output/x86_64-apple-darwin/bitcoin-77eaee0ba46a-x86_64-apple-darwin-unsigned.zip
bae74b14820d06c7667278f320937e2f86a25ae0efc2d94b2a2c905c26c15b2e  guix-build-77eaee0ba46a/output/x86_64-apple-darwin/bitcoin-77eaee0ba46a-x86_64-apple-darwin.tar.gz
6a42ab303c741779c501e85bf7428a3588c16c9eafbda3657de4cc3fcf52753c  guix-build-77eaee0ba46a/output/x86_64-linux-gnu/SHA256SUMS.part
24a368dd727c900adae144967d27ae58893edb6f8821a48d506c9a4ec80d40a9  guix-build-77eaee0ba46a/output/x86_64-linux-gnu/bitcoin-77eaee0ba46a-x86_64-linux-gnu-debug.tar.gz
8430b7ca91b94da095add1db6d46c74a09c791351c81dfeb552c9732cdd54dc2  guix-build-77eaee0ba46a/output/x86_64-linux-gnu/bitcoin-77eaee0ba46a-x86_64-linux-gnu.tar.gz
77485baa9d8edb6ee240dbcd17e6b8ec0613144dc1b3765cb6f1e8142745bc82  guix-build-77eaee0ba46a/output/x86_64-w64-mingw32/SHA256SUMS.part
aba6e456fabfce78727f912fa6be21f880e4e2922f33221eefb26356f5984545  guix-build-77eaee0ba46a/output/x86_64-w64-mingw32/bitcoin-77eaee0ba46a-win64-debug.zip
1ad214989983c5c54a15d1af7aa25e9ea50d2b7d4ba6aeefecd7b7aee7774db3  guix-build-77eaee0ba46a/output/x86_64-w64-mingw32/bitcoin-77eaee0ba46a-win64-setup-unsigned.exe
e02826473de7db61094d71f59084d0e002393ef58c45c420b08ddc3c41a7211f  guix-build-77eaee0ba46a/output/x86_64-w64-mingw32/bitcoin-77eaee0ba46a-win64-unsigned.tar.gz
6b682937c9895475851f20ececee42bef44ffa9fa55d4eecc68b7de75407efad  guix-build-77eaee0ba46a/output/x86_64-w64-mingw32/bitcoin-77eaee0ba46a-win64.zip

@TheCharlatan
Copy link
Contributor

Tested the cross-compiled binaries and deployed bundle on macos 12.7.4.

@TheCharlatan
Copy link
Contributor

Guix builds (x86_64):

c39f93edbd44b97256834f1173f23c311a7f7fdf467ecebd4ec930e0691732ad  guix-build-77eaee0ba46a/output/aarch64-linux-gnu/SHA256SUMS.part
4e88994692636055e105346229ad87fcb40569a984fddb278e92b78498a983ef  guix-build-77eaee0ba46a/output/aarch64-linux-gnu/bitcoin-77eaee0ba46a-aarch64-linux-gnu-debug.tar.gz
f2d7c80d039ecfe9889eada5be4f701f413b22eb679511634a20545528b61a15  guix-build-77eaee0ba46a/output/aarch64-linux-gnu/bitcoin-77eaee0ba46a-aarch64-linux-gnu.tar.gz
df23e2877a33f7c7c2745949e64901c56322ec036407f9aac9525e06b2f7e9eb  guix-build-77eaee0ba46a/output/arm-linux-gnueabihf/SHA256SUMS.part
850d8edfba1b36b5e246300adfa8f725f6202db033078da6e30d38ec9da78c77  guix-build-77eaee0ba46a/output/arm-linux-gnueabihf/bitcoin-77eaee0ba46a-arm-linux-gnueabihf-debug.tar.gz
c4b27197411da1126837e8b25bf074f70c36caf1f9b54432d1e5eaa588a9df02  guix-build-77eaee0ba46a/output/arm-linux-gnueabihf/bitcoin-77eaee0ba46a-arm-linux-gnueabihf.tar.gz
4fd8566ccc8229c4784eac5cc21d077b179b4165b457911fe142ea2e3b0069e7  guix-build-77eaee0ba46a/output/arm64-apple-darwin/SHA256SUMS.part
6cca0ae159eddbf88dd1858eec51625816346487fc5eb9e5260037c686e8e312  guix-build-77eaee0ba46a/output/arm64-apple-darwin/bitcoin-77eaee0ba46a-arm64-apple-darwin-unsigned.tar.gz
c967afbfd76efb0a16e54524734396e56afe249273620f59904253a8608d1416  guix-build-77eaee0ba46a/output/arm64-apple-darwin/bitcoin-77eaee0ba46a-arm64-apple-darwin-unsigned.zip
3d28e921e71106996348e8a483adc1e9e24441fa21455a74323e836a92b01588  guix-build-77eaee0ba46a/output/arm64-apple-darwin/bitcoin-77eaee0ba46a-arm64-apple-darwin.tar.gz
ea71bc724ce8214e97a226279b0c6eb4c392d401b1f3b8a126140467160e379a  guix-build-77eaee0ba46a/output/dist-archive/bitcoin-77eaee0ba46a.tar.gz
4ba4b49a414cddf6da484762a91969a6e6ad9a055365118ac5cd2c4045b34bd8  guix-build-77eaee0ba46a/output/powerpc64-linux-gnu/SHA256SUMS.part
79ea63ee2018b020851f089d6c34d70a18c112af125ad12496df4ccf8942b235  guix-build-77eaee0ba46a/output/powerpc64-linux-gnu/bitcoin-77eaee0ba46a-powerpc64-linux-gnu-debug.tar.gz
a6d8ba0e924a743ae1a1b834afdee238957487f6cb5d56a67bd0c4452bf5c468  guix-build-77eaee0ba46a/output/powerpc64-linux-gnu/bitcoin-77eaee0ba46a-powerpc64-linux-gnu.tar.gz
db34798d4529aadd80ba8ccefbb70be637ba9a8ab8fbbb9485e205d3d6945c96  guix-build-77eaee0ba46a/output/riscv64-linux-gnu/SHA256SUMS.part
2127f321726156fa44022384bea4ca899f09b9c3986ff17910e306844ed77270  guix-build-77eaee0ba46a/output/riscv64-linux-gnu/bitcoin-77eaee0ba46a-riscv64-linux-gnu-debug.tar.gz
73d7f7b9db8eb35754463513448e5be6fbdea0b3dcbb9c213ebea0556fd3a3e4  guix-build-77eaee0ba46a/output/riscv64-linux-gnu/bitcoin-77eaee0ba46a-riscv64-linux-gnu.tar.gz
abe2a8abf88b59982b46f8e7012fa981adbacaf1b424877456754f1c1d331d23  guix-build-77eaee0ba46a/output/x86_64-apple-darwin/SHA256SUMS.part
172b34356fde06ee17a09218c169ae2e4a3c223534a123f9aa67a5f86bded8d2  guix-build-77eaee0ba46a/output/x86_64-apple-darwin/bitcoin-77eaee0ba46a-x86_64-apple-darwin-unsigned.tar.gz
8c3f82577227c0b7133873896c360faf194a4523bb8d9d1602bd97fef2a6beb9  guix-build-77eaee0ba46a/output/x86_64-apple-darwin/bitcoin-77eaee0ba46a-x86_64-apple-darwin-unsigned.zip
bae74b14820d06c7667278f320937e2f86a25ae0efc2d94b2a2c905c26c15b2e  guix-build-77eaee0ba46a/output/x86_64-apple-darwin/bitcoin-77eaee0ba46a-x86_64-apple-darwin.tar.gz
6a42ab303c741779c501e85bf7428a3588c16c9eafbda3657de4cc3fcf52753c  guix-build-77eaee0ba46a/output/x86_64-linux-gnu/SHA256SUMS.part
24a368dd727c900adae144967d27ae58893edb6f8821a48d506c9a4ec80d40a9  guix-build-77eaee0ba46a/output/x86_64-linux-gnu/bitcoin-77eaee0ba46a-x86_64-linux-gnu-debug.tar.gz
8430b7ca91b94da095add1db6d46c74a09c791351c81dfeb552c9732cdd54dc2  guix-build-77eaee0ba46a/output/x86_64-linux-gnu/bitcoin-77eaee0ba46a-x86_64-linux-gnu.tar.gz
77485baa9d8edb6ee240dbcd17e6b8ec0613144dc1b3765cb6f1e8142745bc82  guix-build-77eaee0ba46a/output/x86_64-w64-mingw32/SHA256SUMS.part
aba6e456fabfce78727f912fa6be21f880e4e2922f33221eefb26356f5984545  guix-build-77eaee0ba46a/output/x86_64-w64-mingw32/bitcoin-77eaee0ba46a-win64-debug.zip
1ad214989983c5c54a15d1af7aa25e9ea50d2b7d4ba6aeefecd7b7aee7774db3  guix-build-77eaee0ba46a/output/x86_64-w64-mingw32/bitcoin-77eaee0ba46a-win64-setup-unsigned.exe
e02826473de7db61094d71f59084d0e002393ef58c45c420b08ddc3c41a7211f  guix-build-77eaee0ba46a/output/x86_64-w64-mingw32/bitcoin-77eaee0ba46a-win64-unsigned.tar.gz
6b682937c9895475851f20ececee42bef44ffa9fa55d4eecc68b7de75407efad  guix-build-77eaee0ba46a/output/x86_64-w64-mingw32/bitcoin-77eaee0ba46a-win64.zip

@DrahtBot
Copy link
Contributor

DrahtBot commented Apr 6, 2024

Guix builds (on x86_64)

File commit 5a5ab1d
(master)		 commit f782106
(master and this pull)
SHA256SUMS.part 3950835fcd16ecf0... d7502b103d6adc09...
*-aarch64-linux-gnu-debug.tar.gz 7142f93d7928f6bd... a4a979ec2324aa33...
*-aarch64-linux-gnu.tar.gz 03edf003f6fe0a84... 53f77e4d9e55de1d...
*-arm-linux-gnueabihf-debug.tar.gz c1ee031ad1c082b1... 1d96783b8b6e432a...
*-arm-linux-gnueabihf.tar.gz 0c8ddea5a5c3277f... 8ce676ee3b549160...
*-arm64-apple-darwin-unsigned.tar.gz 50d39ed8954460d7... 8a058513e18f7608...
*-arm64-apple-darwin-unsigned.zip 98adbb961eb3b7dd... 70a4ff60ad5e8bd1...
*-arm64-apple-darwin.tar.gz c0576f29160c7efc... b1184219177b728b...
*-powerpc64-linux-gnu-debug.tar.gz 63bd780c0eb564ad... 903eb89f89d40143...
*-powerpc64-linux-gnu.tar.gz 3b78d6b4c434e64a... 3628720ba596330a...
*-riscv64-linux-gnu-debug.tar.gz 5e7628c5347dc2b8... 07919f28b2f1ce97...
*-riscv64-linux-gnu.tar.gz f2e3f90b6bcf2def... fc9c337b3a483c05...
*-x86_64-apple-darwin-unsigned.tar.gz 8095c1f34a5bf357... fb3049f9f09beeb4...
*-x86_64-apple-darwin-unsigned.zip 80368d1ea02a2b7f... 1dae710cb8e66a55...
*-x86_64-apple-darwin.tar.gz d3c20d12fcfb2726... 729ae639e1f1ec62...
*-x86_64-linux-gnu-debug.tar.gz acccc8dc1b869ae6... ac676289dc1662c7...
*-x86_64-linux-gnu.tar.gz ac71d88ea424c1c4... f7a4f4f8eb11dfcf...
*.tar.gz f0db0794542f221a... bfa1a53c2cb8b175...
guix_build.log 363c6cb1eb5ef169... c9488606097f221f...
guix_build.log.diff 1c6e2d8bae8eddbb...

@fanquake fanquake marked this pull request as draft April 6, 2024 09:40
@fanquake fanquake mentioned this pull request Apr 16, 2024
Merged
@fanquake fanquake force-pushed the swap_otool_llvm_objdump branch 2 times, most recently from 6623a33 to f4a3bd7 Compare April 16, 2024 11:32
@fanquake
Copy link
Member Author

Fixed up.

This was actually just masking a bug. Dropped and rebased on #29890, which has simplified things here.

@DrahtBot
Copy link
Contributor

🚧 At least one of the CI tasks failed. Make sure to run all tests locally, according to the
documentation.

Possibly this is due to a silent merge conflict (the changes in this pull request being
incompatible with the current code in the target branch). If so, make sure to rebase on the latest
commit of the target branch.

Leave a comment here, if you need help tracking down a confusing failure.

Debug: https://github.com/bitcoin/bitcoin/runs/23874000197

fanquake added a commit that referenced this pull request Apr 25, 2024
@fanquake
Merge #29890: deploy: remove some tools when cross-compiling for macOS
d48d55e 
1a9aa8d build: better scope usage of -Wl,-headerpad_max_install_names (fanquake)
3bee514 build: don't use install_name_tool for macOS deploy when cross-compiling (fanquake)
78b6b5c build: don't pass strip to macOS deploy if cross-compiling (fanquake)

Pull request description:

  Neither of these tools are actually used when we are cross-compiling for macOS. They are used when we have to adjust non-static libs during a deploy after building on a macOS machine. Simplies #29739 (will be rebased on top).

  Guix (aarch64):
  ```bash
  8f29bce75d7f574306a0e38d793e0e4e145b547a4b9e5a755a54976121d8ac41  guix-build-5afd3c302051/output/arm64-apple-darwin/SHA256SUMS.part
  9ba01fe46be715adcbe80f39dc7dbe449f32ca9d9b660da698f933aef3e6d80b  guix-build-5afd3c302051/output/arm64-apple-darwin/bitcoin-5afd3c302051-arm64-apple-darwin-unsigned.tar.gz
  37719437e951449341d0e10dcc4afe93e955d59de5312ce6351e1fa01b4927ac  guix-build-5afd3c302051/output/arm64-apple-darwin/bitcoin-5afd3c302051-arm64-apple-darwin-unsigned.zip
  06a79fc871dcd4290f5f7e7e9de19a5a535203d20279f4555d1c319d07abe2d0  guix-build-5afd3c302051/output/arm64-apple-darwin/bitcoin-5afd3c302051-arm64-apple-darwin.tar.gz
  98d2b8b37197dcad36a04eb2f3ff2130b859220a17b83a4186a78dcf0af4eafd  guix-build-5afd3c302051/output/dist-archive/bitcoin-5afd3c302051.tar.gz
  df63ff44ef41565ff13ce6dde5485173a18d5866ebc316df86f9ebd91fda18f5  guix-build-5afd3c302051/output/x86_64-apple-darwin/SHA256SUMS.part
  28362ce9e80d5e78db198efa5f89434fbe76ca91df5fde7455da4d50ceb8523a  guix-build-5afd3c302051/output/x86_64-apple-darwin/bitcoin-5afd3c302051-x86_64-apple-darwin-unsigned.tar.gz
  534745b679eb9e8e408dd251a6bf0829e62e12f7a41772b8a57a044ded14208c  guix-build-5afd3c302051/output/x86_64-apple-darwin/bitcoin-5afd3c302051-x86_64-apple-darwin-unsigned.zip
  f53d0c9a1bb83d548c7d274c7d39653a3989fb1b4efec49e73dd1cac7c92074c  guix-build-5afd3c302051/output/x86_64-apple-darwin/bitcoin-5afd3c302051-x86_64-apple-darwin.tar.gz
  ```

ACKs for top commit:
  TheCharlatan:
    ACK 1a9aa8d

Tree-SHA512: 0aa77ea4d6dc45c226806bb1758b6aa7e8ca17f91045bab4fc6891af7b9de476211cd5692c11cb9d5bcf59744fd86a2534812a77fe304ae10c3518e08fc412be
@fanquake fanquake force-pushed the swap_otool_llvm_objdump branch from f4a3bd7 to 7a49b7f Compare April 25, 2024 13:35
@fanquake fanquake marked this pull request as ready for review April 25, 2024 15:02
@fanquake fanquake force-pushed the swap_otool_llvm_objdump branch 3 times, most recently from 7990c72 to f93bc3d Compare April 27, 2024 05:37
@Sjors
Copy link
Member

Sjors commented May 3, 2024

@fanquake I get the same hashes on AMD Ubuntu 24.04

@DrahtBot
Copy link
Contributor

DrahtBot commented May 4, 2024

Guix builds (on x86_64) [untrusted test-only build, possibly unsafe, not for production use]

File commit f5b6f62
(master)		 commit 07831cc
(master and this pull)
SHA256SUMS.part 9cdafae7623197d3... 86a6c75448a7076c...
*-aarch64-linux-gnu-debug.tar.gz 8f66edb46ef49005... 606e428a07ab101a...
*-aarch64-linux-gnu.tar.gz 84fe9545a200fe24... ee0cf386f09b8e72...
*-arm-linux-gnueabihf-debug.tar.gz 7d2d035ee3879371... d53255bedd328381...
*-arm-linux-gnueabihf.tar.gz 049b1d81080a99c1... bcd6268d6f653fb7...
*-arm64-apple-darwin-unsigned.tar.gz 988172d500ae0af6... 165c1416290aad4c...
*-arm64-apple-darwin-unsigned.zip faa995b81579c6a4... cd1878b865563098...
*-arm64-apple-darwin.tar.gz a0e738dae6e711d3... 2a8890b63a3b30c1...
*-powerpc64-linux-gnu-debug.tar.gz bddad1633e7ea0e1... 535985f17aa17190...
*-powerpc64-linux-gnu.tar.gz aa334b61bc539422... c8804ca6248168ba...
*-riscv64-linux-gnu-debug.tar.gz f1327efb9729ba5c... dc7d8e0db83dd00e...
*-riscv64-linux-gnu.tar.gz 8e823e0abc1858d4... bdcf1f27d6ca0a49...
*-x86_64-apple-darwin-unsigned.tar.gz 3252f1fe64e03653... a924e25eb381bbcc...
*-x86_64-apple-darwin-unsigned.zip 8dc618298270a553... 7e92a99fd51b9ee2...
*-x86_64-apple-darwin.tar.gz 1b8aaf010395467f... 67ab0f068994facc...
*-x86_64-linux-gnu-debug.tar.gz f02ed7e7f5e88dea... 27eac53272490cf6...
*-x86_64-linux-gnu.tar.gz 01c5f5dd6abd8b35... e4508584e431e48f...
*.tar.gz 21dd036012079604... 89b0604dde099f6a...
guix_build.log 9ac75997e38678c9... 6ca15379ad6711d0...
guix_build.log.diff 9cd61324ee450956...

@TheCharlatan
Copy link
Contributor

Guix build (aarch64):

6a215012d268b68b25d3120c63f7154169061d71bef8e3a434dc44d6e2c8bf06  guix-build-4313febae66b/output/aarch64-linux-gnu/SHA256SUMS.part
7469b754ce7632c175116ffb1490771b9a4b635c33ccf711fd5df2cf08c6d6d4  guix-build-4313febae66b/output/aarch64-linux-gnu/bitcoin-4313febae66b-aarch64-linux-gnu-debug.tar.gz
7ffd30c4e1894555a1172e13106d8fbf6291f357073fb17840e653f98fe3599f  guix-build-4313febae66b/output/aarch64-linux-gnu/bitcoin-4313febae66b-aarch64-linux-gnu.tar.gz
f8d0a35036a64564315bb9a78b4b6bd98833e12b65050d2fa90edb42761e019b  guix-build-4313febae66b/output/arm-linux-gnueabihf/SHA256SUMS.part
ff38c6b65820507c9ef2da2f8d5525118d18a0095e7bbf798dec792ade107bc9  guix-build-4313febae66b/output/arm-linux-gnueabihf/bitcoin-4313febae66b-arm-linux-gnueabihf-debug.tar.gz
60cc4a032931f5f625c6848f40a0dcb464f93fa60272e6b5e1d99de7fa6b8995  guix-build-4313febae66b/output/arm-linux-gnueabihf/bitcoin-4313febae66b-arm-linux-gnueabihf.tar.gz
81c2b13be0e7144ceffea31bdb8859100589b6997cb8cc5b4623fb0e3bd39ecb  guix-build-4313febae66b/output/arm64-apple-darwin/SHA256SUMS.part
d97310079e4c4d90a4086e3b5d1feed886066124d0113d57c4adfad73dbff0e1  guix-build-4313febae66b/output/arm64-apple-darwin/bitcoin-4313febae66b-arm64-apple-darwin-unsigned.tar.gz
17c42f86d9807a71b8cdc3a70891d07448d7d1f00fd99345449e70b1e2d11096  guix-build-4313febae66b/output/arm64-apple-darwin/bitcoin-4313febae66b-arm64-apple-darwin-unsigned.zip
2ddecd4600bc71aa62d15a697e71b1ffb987ba5bcda5977dd3082c311ba15d81  guix-build-4313febae66b/output/arm64-apple-darwin/bitcoin-4313febae66b-arm64-apple-darwin.tar.gz
f99fe7222e425e2a61c49b5a286ed4cb9ff7116e626dd529a550ca0036c99193  guix-build-4313febae66b/output/dist-archive/bitcoin-4313febae66b.tar.gz
90d6d5ea3c396722675cca8e4bece835aadc3fa960702aff84492e4707e3be69  guix-build-4313febae66b/output/powerpc64-linux-gnu/SHA256SUMS.part
63968f04ffec5e12fd1416f2a552abfec421ea42aae66e865896fae6b281baf0  guix-build-4313febae66b/output/powerpc64-linux-gnu/bitcoin-4313febae66b-powerpc64-linux-gnu-debug.tar.gz
4dc54c5ecb4697590045f2e8ccb1e3323dbd4d2c680d2f08cc6247f048ed5ca9  guix-build-4313febae66b/output/powerpc64-linux-gnu/bitcoin-4313febae66b-powerpc64-linux-gnu.tar.gz
6c5917106c0bfabfc2f903c6a5626916311aae6aace99a8db718d0d337fad107  guix-build-4313febae66b/output/riscv64-linux-gnu/SHA256SUMS.part
20a7379b761544a8b692c52270665ecc12866d1e3aa646bea7927a84d21b2e8c  guix-build-4313febae66b/output/riscv64-linux-gnu/bitcoin-4313febae66b-riscv64-linux-gnu-debug.tar.gz
987d77d6f430b75f1aa9077034139b4bf5f5ebae01dd6ff54d9bfb1fde2f22ae  guix-build-4313febae66b/output/riscv64-linux-gnu/bitcoin-4313febae66b-riscv64-linux-gnu.tar.gz
77e5af87f24dbe993bfcef973a22d1d0c51179f4a748a8a90f06c3f64f710c97  guix-build-4313febae66b/output/x86_64-apple-darwin/SHA256SUMS.part
6edc1a7bc156b5d4780600a97f8ae4aea02a12d416236cbb60e592075bd69951  guix-build-4313febae66b/output/x86_64-apple-darwin/bitcoin-4313febae66b-x86_64-apple-darwin-unsigned.tar.gz
e524c81499a0de8646e418155b661c320a7a5b61897b89e06f69540de6b2a524  guix-build-4313febae66b/output/x86_64-apple-darwin/bitcoin-4313febae66b-x86_64-apple-darwin-unsigned.zip
c7266336a650b11edc8ac40de7ebbe7d347e9ae89bcbaf4ca85254b42ee71e54  guix-build-4313febae66b/output/x86_64-apple-darwin/bitcoin-4313febae66b-x86_64-apple-darwin.tar.gz
9648c09f4376c18da1c56d0eb0290e902230db4e43678c06b6fd9baa51f8bcc2  guix-build-4313febae66b/output/x86_64-linux-gnu/SHA256SUMS.part
00f3ada092741eae249cce457605a7d23f40a82feb20df57d16ea497e49c52c0  guix-build-4313febae66b/output/x86_64-linux-gnu/bitcoin-4313febae66b-x86_64-linux-gnu-debug.tar.gz
49357ff04cdc292f84c08ae6d88c5555f8200160c7c5a151b6c5445b56311193  guix-build-4313febae66b/output/x86_64-linux-gnu/bitcoin-4313febae66b-x86_64-linux-gnu.tar.gz
69303b903cbbef05385694aeb31a0b349ce4c78dcb2f93e5f9f68c15a79ba983  guix-build-4313febae66b/output/x86_64-w64-mingw32/SHA256SUMS.part
717ae4ed33487b81765e4f0733170fe8297c1ab23c8056991d3e2fb6a9491bad  guix-build-4313febae66b/output/x86_64-w64-mingw32/bitcoin-4313febae66b-win64-debug.zip
ff678e1985f2c431658006c6364a80f4b7140f147a588e2dcebc5eebcece99de  guix-build-4313febae66b/output/x86_64-w64-mingw32/bitcoin-4313febae66b-win64-setup-unsigned.exe
6b126db126ce0b542b6694fb29bc8a8af085ea1adfa852e71828484ec1ece9e2  guix-build-4313febae66b/output/x86_64-w64-mingw32/bitcoin-4313febae66b-win64-unsigned.tar.gz
c5542f41a960affa31b55e38f9bf730d108d3bc12ef0a01a192b6752fd05ac58  guix-build-4313febae66b/output/x86_64-w64-mingw32/bitcoin-4313febae66b-win64.zip

@fanquake
build: swap otool for (llvm-)objdump
7f5ac45 
Similar to libtool, (llvm-)otool only exists with a version suffix
on some systems (Ubuntu), which makes it annoying to use/find. Avoid
this, by switching to objdump. Which is a drop-in replacement.

This is related to bitcoin#21778, and the switchover to using vanilla LLVM for
macOS.
@fanquake fanquake changed the title depends: swap some cctools tools for LLVM tools build: swap cctools otool for llvm-objdump May 8, 2024
@fanquake fanquake force-pushed the swap_otool_llvm_objdump branch from 4313feb to 7f5ac45 Compare May 8, 2024 10:27
@fanquake
Copy link
Member Author

fanquake commented May 8, 2024

Dropped the last commit just to make this simpler to review. The swap to objdump is the most complex of the cctools -> llvm swaps, because of the associated Python changes, all the of the rest are easier, and can be done in 1 go in a followup.

@fanquake
Copy link
Member Author

fanquake commented May 9, 2024

Guix build (aarch64):

67f4db93b4f985590948dc344306042841ab747b40ad73bf97ba62d77eb7bfd4  guix-build-7f5ac4520d15/output/aarch64-linux-gnu/SHA256SUMS.part
62e019f164d3c8cf8a1a649b2caa500dd85b00a319910feaf97658020b8cd1e3  guix-build-7f5ac4520d15/output/aarch64-linux-gnu/bitcoin-7f5ac4520d15-aarch64-linux-gnu-debug.tar.gz
c2227a058cf91c0bc3eb244cb254c3c6fcecddc21ba619bca8839d9d79bb1961  guix-build-7f5ac4520d15/output/aarch64-linux-gnu/bitcoin-7f5ac4520d15-aarch64-linux-gnu.tar.gz
e794a50c8aeebefa61531469208080bbba7dc1d3a4658b0aedeb9988428c9feb  guix-build-7f5ac4520d15/output/arm-linux-gnueabihf/SHA256SUMS.part
c5681536ffe85b27a078540db918a3113351b5a5da75f9d77709a422e0e22129  guix-build-7f5ac4520d15/output/arm-linux-gnueabihf/bitcoin-7f5ac4520d15-arm-linux-gnueabihf-debug.tar.gz
fe9cb7ae413614baffedb7c4fd16254aed816d4a79b0d267d5482dc3000b6dad  guix-build-7f5ac4520d15/output/arm-linux-gnueabihf/bitcoin-7f5ac4520d15-arm-linux-gnueabihf.tar.gz
1d1a5b78a5cae8f0fa34a88168a34e0bf0aadaaaf29360109a089222824c11dc  guix-build-7f5ac4520d15/output/arm64-apple-darwin/SHA256SUMS.part
64bef8bef26d24d3276f4eee20161e22f645f55fb1cdff39dd0c6a9df434f633  guix-build-7f5ac4520d15/output/arm64-apple-darwin/bitcoin-7f5ac4520d15-arm64-apple-darwin-unsigned.tar.gz
dea89a35fd4bec7945e9e735e6057ab462b8ec3914fb2b5265bc72cca5ced616  guix-build-7f5ac4520d15/output/arm64-apple-darwin/bitcoin-7f5ac4520d15-arm64-apple-darwin-unsigned.zip
25fafdc462c06c59cbb4ac0ac12a77fa33a0b742ac23584258a4558f1c3fe797  guix-build-7f5ac4520d15/output/arm64-apple-darwin/bitcoin-7f5ac4520d15-arm64-apple-darwin.tar.gz
e307d1b0d3b39aadb8cc794e00f0acbc4289794feb266f22c8d9013ab9869444  guix-build-7f5ac4520d15/output/dist-archive/bitcoin-7f5ac4520d15.tar.gz
9b5a40d7838bfe268443cf594a6798b6be3b9e2b875ae6e0084f6894d592ac3c  guix-build-7f5ac4520d15/output/powerpc64-linux-gnu/SHA256SUMS.part
fa95ecef8e32b7e4bea3d6c4a6910a3d13ac87c46324f9769fe1aeb990d2830d  guix-build-7f5ac4520d15/output/powerpc64-linux-gnu/bitcoin-7f5ac4520d15-powerpc64-linux-gnu-debug.tar.gz
b9697fa2633d080b14db8abd2f7219e3aa41171aefb76eeb99090027cb8bb8b7  guix-build-7f5ac4520d15/output/powerpc64-linux-gnu/bitcoin-7f5ac4520d15-powerpc64-linux-gnu.tar.gz
b288387bf7959fd91aa676a0be643496f47118fcbbf6ce36f8d7dc4e7cef08e8  guix-build-7f5ac4520d15/output/riscv64-linux-gnu/SHA256SUMS.part
0795fc420ad52e3f599d8b7e1c86c09fb7ca53a6171008cf8a6d205ddd273357  guix-build-7f5ac4520d15/output/riscv64-linux-gnu/bitcoin-7f5ac4520d15-riscv64-linux-gnu-debug.tar.gz
4cc70dd8da7b48ad810f14190a19e1475a58f753922f177943449806af550387  guix-build-7f5ac4520d15/output/riscv64-linux-gnu/bitcoin-7f5ac4520d15-riscv64-linux-gnu.tar.gz
af2d4af34b801209a85b8ef6d149f5fa152348134ea9abe7e38cb50d5e5f4b85  guix-build-7f5ac4520d15/output/x86_64-apple-darwin/SHA256SUMS.part
7066c328aac9138479a174e5b62fad4dce68a2a225ca9639020a9567a0e3022a  guix-build-7f5ac4520d15/output/x86_64-apple-darwin/bitcoin-7f5ac4520d15-x86_64-apple-darwin-unsigned.tar.gz
fd2301f76637d62912130996bd6f9d6162f934bf8ba7cea32b8508f90bc59e75  guix-build-7f5ac4520d15/output/x86_64-apple-darwin/bitcoin-7f5ac4520d15-x86_64-apple-darwin-unsigned.zip
cbbfa6d6b2e4530071164f87389a0e55104417f0123d8bff29d519f72a992f7a  guix-build-7f5ac4520d15/output/x86_64-apple-darwin/bitcoin-7f5ac4520d15-x86_64-apple-darwin.tar.gz
33c2e40a65b0ad415028ff6d01a568bd566bd677ae078dc0aac6b347e72ac7f7  guix-build-7f5ac4520d15/output/x86_64-linux-gnu/SHA256SUMS.part
b666cf8de8a98019b7d18511cb4ed3bc85b0a0e44af669754c0d3306e8925341  guix-build-7f5ac4520d15/output/x86_64-linux-gnu/bitcoin-7f5ac4520d15-x86_64-linux-gnu-debug.tar.gz
570e71ac049b8093a4b4afdb45a24e694585d8587c09db53687630da97b3b1c9  guix-build-7f5ac4520d15/output/x86_64-linux-gnu/bitcoin-7f5ac4520d15-x86_64-linux-gnu.tar.gz
6313e18382824d8ab6b2db58f6f12d5a23df71e419dfcc5fca6f8fab3b2e1dc4  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/SHA256SUMS.part
074b9d6c52920f86ae161010d819ae9e80a1fa814fb148eb7726b211a9827541  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/bitcoin-7f5ac4520d15-win64-debug.zip
0748410dd75c764c443fe519398ede89b70857f6f6a58cbb12e1d9cf7ce42d20  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/bitcoin-7f5ac4520d15-win64-setup-unsigned.exe
bd9edbc9dd51a147175bef1443e1c2b419b804252c2b0ef14ae49639381586bc  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/bitcoin-7f5ac4520d15-win64-unsigned.tar.gz
8d74c85baaedaf9dadec59cf68babd56cc6869eca6eae3fce494453dd80c99d4  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/bitcoin-7f5ac4520d15-win64.zip

@TheCharlatan
Copy link
Contributor

Guix builds (aarch64):

67f4db93b4f985590948dc344306042841ab747b40ad73bf97ba62d77eb7bfd4  guix-build-7f5ac4520d15/output/aarch64-linux-gnu/SHA256SUMS.part
62e019f164d3c8cf8a1a649b2caa500dd85b00a319910feaf97658020b8cd1e3  guix-build-7f5ac4520d15/output/aarch64-linux-gnu/bitcoin-7f5ac4520d15-aarch64-linux-gnu-debug.tar.gz
c2227a058cf91c0bc3eb244cb254c3c6fcecddc21ba619bca8839d9d79bb1961  guix-build-7f5ac4520d15/output/aarch64-linux-gnu/bitcoin-7f5ac4520d15-aarch64-linux-gnu.tar.gz
e794a50c8aeebefa61531469208080bbba7dc1d3a4658b0aedeb9988428c9feb  guix-build-7f5ac4520d15/output/arm-linux-gnueabihf/SHA256SUMS.part
c5681536ffe85b27a078540db918a3113351b5a5da75f9d77709a422e0e22129  guix-build-7f5ac4520d15/output/arm-linux-gnueabihf/bitcoin-7f5ac4520d15-arm-linux-gnueabihf-debug.tar.gz
fe9cb7ae413614baffedb7c4fd16254aed816d4a79b0d267d5482dc3000b6dad  guix-build-7f5ac4520d15/output/arm-linux-gnueabihf/bitcoin-7f5ac4520d15-arm-linux-gnueabihf.tar.gz
1d1a5b78a5cae8f0fa34a88168a34e0bf0aadaaaf29360109a089222824c11dc  guix-build-7f5ac4520d15/output/arm64-apple-darwin/SHA256SUMS.part
64bef8bef26d24d3276f4eee20161e22f645f55fb1cdff39dd0c6a9df434f633  guix-build-7f5ac4520d15/output/arm64-apple-darwin/bitcoin-7f5ac4520d15-arm64-apple-darwin-unsigned.tar.gz
dea89a35fd4bec7945e9e735e6057ab462b8ec3914fb2b5265bc72cca5ced616  guix-build-7f5ac4520d15/output/arm64-apple-darwin/bitcoin-7f5ac4520d15-arm64-apple-darwin-unsigned.zip
25fafdc462c06c59cbb4ac0ac12a77fa33a0b742ac23584258a4558f1c3fe797  guix-build-7f5ac4520d15/output/arm64-apple-darwin/bitcoin-7f5ac4520d15-arm64-apple-darwin.tar.gz
e307d1b0d3b39aadb8cc794e00f0acbc4289794feb266f22c8d9013ab9869444  guix-build-7f5ac4520d15/output/dist-archive/bitcoin-7f5ac4520d15.tar.gz
9b5a40d7838bfe268443cf594a6798b6be3b9e2b875ae6e0084f6894d592ac3c  guix-build-7f5ac4520d15/output/powerpc64-linux-gnu/SHA256SUMS.part
fa95ecef8e32b7e4bea3d6c4a6910a3d13ac87c46324f9769fe1aeb990d2830d  guix-build-7f5ac4520d15/output/powerpc64-linux-gnu/bitcoin-7f5ac4520d15-powerpc64-linux-gnu-debug.tar.gz
b9697fa2633d080b14db8abd2f7219e3aa41171aefb76eeb99090027cb8bb8b7  guix-build-7f5ac4520d15/output/powerpc64-linux-gnu/bitcoin-7f5ac4520d15-powerpc64-linux-gnu.tar.gz
b288387bf7959fd91aa676a0be643496f47118fcbbf6ce36f8d7dc4e7cef08e8  guix-build-7f5ac4520d15/output/riscv64-linux-gnu/SHA256SUMS.part
0795fc420ad52e3f599d8b7e1c86c09fb7ca53a6171008cf8a6d205ddd273357  guix-build-7f5ac4520d15/output/riscv64-linux-gnu/bitcoin-7f5ac4520d15-riscv64-linux-gnu-debug.tar.gz
4cc70dd8da7b48ad810f14190a19e1475a58f753922f177943449806af550387  guix-build-7f5ac4520d15/output/riscv64-linux-gnu/bitcoin-7f5ac4520d15-riscv64-linux-gnu.tar.gz
af2d4af34b801209a85b8ef6d149f5fa152348134ea9abe7e38cb50d5e5f4b85  guix-build-7f5ac4520d15/output/x86_64-apple-darwin/SHA256SUMS.part
7066c328aac9138479a174e5b62fad4dce68a2a225ca9639020a9567a0e3022a  guix-build-7f5ac4520d15/output/x86_64-apple-darwin/bitcoin-7f5ac4520d15-x86_64-apple-darwin-unsigned.tar.gz
fd2301f76637d62912130996bd6f9d6162f934bf8ba7cea32b8508f90bc59e75  guix-build-7f5ac4520d15/output/x86_64-apple-darwin/bitcoin-7f5ac4520d15-x86_64-apple-darwin-unsigned.zip
cbbfa6d6b2e4530071164f87389a0e55104417f0123d8bff29d519f72a992f7a  guix-build-7f5ac4520d15/output/x86_64-apple-darwin/bitcoin-7f5ac4520d15-x86_64-apple-darwin.tar.gz
33c2e40a65b0ad415028ff6d01a568bd566bd677ae078dc0aac6b347e72ac7f7  guix-build-7f5ac4520d15/output/x86_64-linux-gnu/SHA256SUMS.part
b666cf8de8a98019b7d18511cb4ed3bc85b0a0e44af669754c0d3306e8925341  guix-build-7f5ac4520d15/output/x86_64-linux-gnu/bitcoin-7f5ac4520d15-x86_64-linux-gnu-debug.tar.gz
570e71ac049b8093a4b4afdb45a24e694585d8587c09db53687630da97b3b1c9  guix-build-7f5ac4520d15/output/x86_64-linux-gnu/bitcoin-7f5ac4520d15-x86_64-linux-gnu.tar.gz
c120be9d2aa8b5883f0ef8762b5e3093a8d0a2f034b456750085fe1f50dca455  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/SHA256SUMS.part
91433dd01de315488753edc3e13f7300c53231eb3e7dab55d233631b95a33e9f  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/bitcoin-7f5ac4520d15-win64-debug.zip
0748410dd75c764c443fe519398ede89b70857f6f6a58cbb12e1d9cf7ce42d20  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/bitcoin-7f5ac4520d15-win64-setup-unsigned.exe
bd9edbc9dd51a147175bef1443e1c2b419b804252c2b0ef14ae49639381586bc  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/bitcoin-7f5ac4520d15-win64-unsigned.tar.gz
8d74c85baaedaf9dadec59cf68babd56cc6869eca6eae3fce494453dd80c99d4  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/bitcoin-7f5ac4520d15-win64.zip

There is a mismatch on the windows debug zip :/

@Sjors
Copy link
Member

Sjors commented May 9, 2024

AMD Ubuntu:

67f4db93b4f985590948dc344306042841ab747b40ad73bf97ba62d77eb7bfd4  guix-build-7f5ac4520d15/output/aarch64-linux-gnu/SHA256SUMS.part
62e019f164d3c8cf8a1a649b2caa500dd85b00a319910feaf97658020b8cd1e3  guix-build-7f5ac4520d15/output/aarch64-linux-gnu/bitcoin-7f5ac4520d15-aarch64-linux-gnu-debug.tar.gz
c2227a058cf91c0bc3eb244cb254c3c6fcecddc21ba619bca8839d9d79bb1961  guix-build-7f5ac4520d15/output/aarch64-linux-gnu/bitcoin-7f5ac4520d15-aarch64-linux-gnu.tar.gz
e794a50c8aeebefa61531469208080bbba7dc1d3a4658b0aedeb9988428c9feb  guix-build-7f5ac4520d15/output/arm-linux-gnueabihf/SHA256SUMS.part
c5681536ffe85b27a078540db918a3113351b5a5da75f9d77709a422e0e22129  guix-build-7f5ac4520d15/output/arm-linux-gnueabihf/bitcoin-7f5ac4520d15-arm-linux-gnueabihf-debug.tar.gz
fe9cb7ae413614baffedb7c4fd16254aed816d4a79b0d267d5482dc3000b6dad  guix-build-7f5ac4520d15/output/arm-linux-gnueabihf/bitcoin-7f5ac4520d15-arm-linux-gnueabihf.tar.gz
1d1a5b78a5cae8f0fa34a88168a34e0bf0aadaaaf29360109a089222824c11dc  guix-build-7f5ac4520d15/output/arm64-apple-darwin/SHA256SUMS.part
64bef8bef26d24d3276f4eee20161e22f645f55fb1cdff39dd0c6a9df434f633  guix-build-7f5ac4520d15/output/arm64-apple-darwin/bitcoin-7f5ac4520d15-arm64-apple-darwin-unsigned.tar.gz
dea89a35fd4bec7945e9e735e6057ab462b8ec3914fb2b5265bc72cca5ced616  guix-build-7f5ac4520d15/output/arm64-apple-darwin/bitcoin-7f5ac4520d15-arm64-apple-darwin-unsigned.zip
25fafdc462c06c59cbb4ac0ac12a77fa33a0b742ac23584258a4558f1c3fe797  guix-build-7f5ac4520d15/output/arm64-apple-darwin/bitcoin-7f5ac4520d15-arm64-apple-darwin.tar.gz
e307d1b0d3b39aadb8cc794e00f0acbc4289794feb266f22c8d9013ab9869444  guix-build-7f5ac4520d15/output/dist-archive/bitcoin-7f5ac4520d15.tar.gz
9b5a40d7838bfe268443cf594a6798b6be3b9e2b875ae6e0084f6894d592ac3c  guix-build-7f5ac4520d15/output/powerpc64-linux-gnu/SHA256SUMS.part
fa95ecef8e32b7e4bea3d6c4a6910a3d13ac87c46324f9769fe1aeb990d2830d  guix-build-7f5ac4520d15/output/powerpc64-linux-gnu/bitcoin-7f5ac4520d15-powerpc64-linux-gnu-debug.tar.gz
b9697fa2633d080b14db8abd2f7219e3aa41171aefb76eeb99090027cb8bb8b7  guix-build-7f5ac4520d15/output/powerpc64-linux-gnu/bitcoin-7f5ac4520d15-powerpc64-linux-gnu.tar.gz
b288387bf7959fd91aa676a0be643496f47118fcbbf6ce36f8d7dc4e7cef08e8  guix-build-7f5ac4520d15/output/riscv64-linux-gnu/SHA256SUMS.part
0795fc420ad52e3f599d8b7e1c86c09fb7ca53a6171008cf8a6d205ddd273357  guix-build-7f5ac4520d15/output/riscv64-linux-gnu/bitcoin-7f5ac4520d15-riscv64-linux-gnu-debug.tar.gz
4cc70dd8da7b48ad810f14190a19e1475a58f753922f177943449806af550387  guix-build-7f5ac4520d15/output/riscv64-linux-gnu/bitcoin-7f5ac4520d15-riscv64-linux-gnu.tar.gz
af2d4af34b801209a85b8ef6d149f5fa152348134ea9abe7e38cb50d5e5f4b85  guix-build-7f5ac4520d15/output/x86_64-apple-darwin/SHA256SUMS.part
7066c328aac9138479a174e5b62fad4dce68a2a225ca9639020a9567a0e3022a  guix-build-7f5ac4520d15/output/x86_64-apple-darwin/bitcoin-7f5ac4520d15-x86_64-apple-darwin-unsigned.tar.gz
fd2301f76637d62912130996bd6f9d6162f934bf8ba7cea32b8508f90bc59e75  guix-build-7f5ac4520d15/output/x86_64-apple-darwin/bitcoin-7f5ac4520d15-x86_64-apple-darwin-unsigned.zip
cbbfa6d6b2e4530071164f87389a0e55104417f0123d8bff29d519f72a992f7a  guix-build-7f5ac4520d15/output/x86_64-apple-darwin/bitcoin-7f5ac4520d15-x86_64-apple-darwin.tar.gz
33c2e40a65b0ad415028ff6d01a568bd566bd677ae078dc0aac6b347e72ac7f7  guix-build-7f5ac4520d15/output/x86_64-linux-gnu/SHA256SUMS.part
b666cf8de8a98019b7d18511cb4ed3bc85b0a0e44af669754c0d3306e8925341  guix-build-7f5ac4520d15/output/x86_64-linux-gnu/bitcoin-7f5ac4520d15-x86_64-linux-gnu-debug.tar.gz
570e71ac049b8093a4b4afdb45a24e694585d8587c09db53687630da97b3b1c9  guix-build-7f5ac4520d15/output/x86_64-linux-gnu/bitcoin-7f5ac4520d15-x86_64-linux-gnu.tar.gz
c120be9d2aa8b5883f0ef8762b5e3093a8d0a2f034b456750085fe1f50dca455  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/SHA256SUMS.part
91433dd01de315488753edc3e13f7300c53231eb3e7dab55d233631b95a33e9f  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/bitcoin-7f5ac4520d15-win64-debug.zip
0748410dd75c764c443fe519398ede89b70857f6f6a58cbb12e1d9cf7ce42d20  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/bitcoin-7f5ac4520d15-win64-setup-unsigned.exe
bd9edbc9dd51a147175bef1443e1c2b419b804252c2b0ef14ae49639381586bc  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/bitcoin-7f5ac4520d15-win64-unsigned.tar.gz
8d74c85baaedaf9dadec59cf68babd56cc6869eca6eae3fce494453dd80c99d4  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/bitcoin-7f5ac4520d15-win64.zip

theuni
theuni approved these changes May 9, 2024
View reviewed changes
Copy link
Member

@theuni theuni left a comment

Choose a reason for hiding this comment

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

ACK 7f5ac45. Tested make deploy on native macOS. Looks good.

@fanquake
Copy link
Member Author

There is a mismatch on the windows debug zip :/

I've rebuilt, and see matching now (you and Sjors):

67f4db93b4f985590948dc344306042841ab747b40ad73bf97ba62d77eb7bfd4  guix-build-7f5ac4520d15/output/aarch64-linux-gnu/SHA256SUMS.part
62e019f164d3c8cf8a1a649b2caa500dd85b00a319910feaf97658020b8cd1e3  guix-build-7f5ac4520d15/output/aarch64-linux-gnu/bitcoin-7f5ac4520d15-aarch64-linux-gnu-debug.tar.gz
c2227a058cf91c0bc3eb244cb254c3c6fcecddc21ba619bca8839d9d79bb1961  guix-build-7f5ac4520d15/output/aarch64-linux-gnu/bitcoin-7f5ac4520d15-aarch64-linux-gnu.tar.gz
e794a50c8aeebefa61531469208080bbba7dc1d3a4658b0aedeb9988428c9feb  guix-build-7f5ac4520d15/output/arm-linux-gnueabihf/SHA256SUMS.part
c5681536ffe85b27a078540db918a3113351b5a5da75f9d77709a422e0e22129  guix-build-7f5ac4520d15/output/arm-linux-gnueabihf/bitcoin-7f5ac4520d15-arm-linux-gnueabihf-debug.tar.gz
fe9cb7ae413614baffedb7c4fd16254aed816d4a79b0d267d5482dc3000b6dad  guix-build-7f5ac4520d15/output/arm-linux-gnueabihf/bitcoin-7f5ac4520d15-arm-linux-gnueabihf.tar.gz
1d1a5b78a5cae8f0fa34a88168a34e0bf0aadaaaf29360109a089222824c11dc  guix-build-7f5ac4520d15/output/arm64-apple-darwin/SHA256SUMS.part
64bef8bef26d24d3276f4eee20161e22f645f55fb1cdff39dd0c6a9df434f633  guix-build-7f5ac4520d15/output/arm64-apple-darwin/bitcoin-7f5ac4520d15-arm64-apple-darwin-unsigned.tar.gz
dea89a35fd4bec7945e9e735e6057ab462b8ec3914fb2b5265bc72cca5ced616  guix-build-7f5ac4520d15/output/arm64-apple-darwin/bitcoin-7f5ac4520d15-arm64-apple-darwin-unsigned.zip
25fafdc462c06c59cbb4ac0ac12a77fa33a0b742ac23584258a4558f1c3fe797  guix-build-7f5ac4520d15/output/arm64-apple-darwin/bitcoin-7f5ac4520d15-arm64-apple-darwin.tar.gz
e307d1b0d3b39aadb8cc794e00f0acbc4289794feb266f22c8d9013ab9869444  guix-build-7f5ac4520d15/output/dist-archive/bitcoin-7f5ac4520d15.tar.gz
9b5a40d7838bfe268443cf594a6798b6be3b9e2b875ae6e0084f6894d592ac3c  guix-build-7f5ac4520d15/output/powerpc64-linux-gnu/SHA256SUMS.part
fa95ecef8e32b7e4bea3d6c4a6910a3d13ac87c46324f9769fe1aeb990d2830d  guix-build-7f5ac4520d15/output/powerpc64-linux-gnu/bitcoin-7f5ac4520d15-powerpc64-linux-gnu-debug.tar.gz
b9697fa2633d080b14db8abd2f7219e3aa41171aefb76eeb99090027cb8bb8b7  guix-build-7f5ac4520d15/output/powerpc64-linux-gnu/bitcoin-7f5ac4520d15-powerpc64-linux-gnu.tar.gz
b288387bf7959fd91aa676a0be643496f47118fcbbf6ce36f8d7dc4e7cef08e8  guix-build-7f5ac4520d15/output/riscv64-linux-gnu/SHA256SUMS.part
0795fc420ad52e3f599d8b7e1c86c09fb7ca53a6171008cf8a6d205ddd273357  guix-build-7f5ac4520d15/output/riscv64-linux-gnu/bitcoin-7f5ac4520d15-riscv64-linux-gnu-debug.tar.gz
4cc70dd8da7b48ad810f14190a19e1475a58f753922f177943449806af550387  guix-build-7f5ac4520d15/output/riscv64-linux-gnu/bitcoin-7f5ac4520d15-riscv64-linux-gnu.tar.gz
af2d4af34b801209a85b8ef6d149f5fa152348134ea9abe7e38cb50d5e5f4b85  guix-build-7f5ac4520d15/output/x86_64-apple-darwin/SHA256SUMS.part
7066c328aac9138479a174e5b62fad4dce68a2a225ca9639020a9567a0e3022a  guix-build-7f5ac4520d15/output/x86_64-apple-darwin/bitcoin-7f5ac4520d15-x86_64-apple-darwin-unsigned.tar.gz
fd2301f76637d62912130996bd6f9d6162f934bf8ba7cea32b8508f90bc59e75  guix-build-7f5ac4520d15/output/x86_64-apple-darwin/bitcoin-7f5ac4520d15-x86_64-apple-darwin-unsigned.zip
cbbfa6d6b2e4530071164f87389a0e55104417f0123d8bff29d519f72a992f7a  guix-build-7f5ac4520d15/output/x86_64-apple-darwin/bitcoin-7f5ac4520d15-x86_64-apple-darwin.tar.gz
33c2e40a65b0ad415028ff6d01a568bd566bd677ae078dc0aac6b347e72ac7f7  guix-build-7f5ac4520d15/output/x86_64-linux-gnu/SHA256SUMS.part
b666cf8de8a98019b7d18511cb4ed3bc85b0a0e44af669754c0d3306e8925341  guix-build-7f5ac4520d15/output/x86_64-linux-gnu/bitcoin-7f5ac4520d15-x86_64-linux-gnu-debug.tar.gz
570e71ac049b8093a4b4afdb45a24e694585d8587c09db53687630da97b3b1c9  guix-build-7f5ac4520d15/output/x86_64-linux-gnu/bitcoin-7f5ac4520d15-x86_64-linux-gnu.tar.gz
c120be9d2aa8b5883f0ef8762b5e3093a8d0a2f034b456750085fe1f50dca455  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/SHA256SUMS.part
91433dd01de315488753edc3e13f7300c53231eb3e7dab55d233631b95a33e9f  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/bitcoin-7f5ac4520d15-win64-debug.zip
0748410dd75c764c443fe519398ede89b70857f6f6a58cbb12e1d9cf7ce42d20  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/bitcoin-7f5ac4520d15-win64-setup-unsigned.exe
bd9edbc9dd51a147175bef1443e1c2b419b804252c2b0ef14ae49639381586bc  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/bitcoin-7f5ac4520d15-win64-unsigned.tar.gz
8d74c85baaedaf9dadec59cf68babd56cc6869eca6eae3fce494453dd80c99d4  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/bitcoin-7f5ac4520d15-win64.zip

@TheCharlatan
Copy link
Contributor

I've rebuilt, and see matching now (you and Sjors)

Also refired and got the same hashes again. Might have been something else unrelated to this PR?

ACK 7f5ac45

hebasto
hebasto reviewed May 10, 2024
View reviewed changes
Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

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

My Guix build:

67f4db93b4f985590948dc344306042841ab747b40ad73bf97ba62d77eb7bfd4  guix-build-7f5ac4520d15/output/aarch64-linux-gnu/SHA256SUMS.part
62e019f164d3c8cf8a1a649b2caa500dd85b00a319910feaf97658020b8cd1e3  guix-build-7f5ac4520d15/output/aarch64-linux-gnu/bitcoin-7f5ac4520d15-aarch64-linux-gnu-debug.tar.gz
c2227a058cf91c0bc3eb244cb254c3c6fcecddc21ba619bca8839d9d79bb1961  guix-build-7f5ac4520d15/output/aarch64-linux-gnu/bitcoin-7f5ac4520d15-aarch64-linux-gnu.tar.gz
e794a50c8aeebefa61531469208080bbba7dc1d3a4658b0aedeb9988428c9feb  guix-build-7f5ac4520d15/output/arm-linux-gnueabihf/SHA256SUMS.part
c5681536ffe85b27a078540db918a3113351b5a5da75f9d77709a422e0e22129  guix-build-7f5ac4520d15/output/arm-linux-gnueabihf/bitcoin-7f5ac4520d15-arm-linux-gnueabihf-debug.tar.gz
fe9cb7ae413614baffedb7c4fd16254aed816d4a79b0d267d5482dc3000b6dad  guix-build-7f5ac4520d15/output/arm-linux-gnueabihf/bitcoin-7f5ac4520d15-arm-linux-gnueabihf.tar.gz
1d1a5b78a5cae8f0fa34a88168a34e0bf0aadaaaf29360109a089222824c11dc  guix-build-7f5ac4520d15/output/arm64-apple-darwin/SHA256SUMS.part
64bef8bef26d24d3276f4eee20161e22f645f55fb1cdff39dd0c6a9df434f633  guix-build-7f5ac4520d15/output/arm64-apple-darwin/bitcoin-7f5ac4520d15-arm64-apple-darwin-unsigned.tar.gz
dea89a35fd4bec7945e9e735e6057ab462b8ec3914fb2b5265bc72cca5ced616  guix-build-7f5ac4520d15/output/arm64-apple-darwin/bitcoin-7f5ac4520d15-arm64-apple-darwin-unsigned.zip
25fafdc462c06c59cbb4ac0ac12a77fa33a0b742ac23584258a4558f1c3fe797  guix-build-7f5ac4520d15/output/arm64-apple-darwin/bitcoin-7f5ac4520d15-arm64-apple-darwin.tar.gz
e307d1b0d3b39aadb8cc794e00f0acbc4289794feb266f22c8d9013ab9869444  guix-build-7f5ac4520d15/output/dist-archive/bitcoin-7f5ac4520d15.tar.gz
9b5a40d7838bfe268443cf594a6798b6be3b9e2b875ae6e0084f6894d592ac3c  guix-build-7f5ac4520d15/output/powerpc64-linux-gnu/SHA256SUMS.part
fa95ecef8e32b7e4bea3d6c4a6910a3d13ac87c46324f9769fe1aeb990d2830d  guix-build-7f5ac4520d15/output/powerpc64-linux-gnu/bitcoin-7f5ac4520d15-powerpc64-linux-gnu-debug.tar.gz
b9697fa2633d080b14db8abd2f7219e3aa41171aefb76eeb99090027cb8bb8b7  guix-build-7f5ac4520d15/output/powerpc64-linux-gnu/bitcoin-7f5ac4520d15-powerpc64-linux-gnu.tar.gz
b288387bf7959fd91aa676a0be643496f47118fcbbf6ce36f8d7dc4e7cef08e8  guix-build-7f5ac4520d15/output/riscv64-linux-gnu/SHA256SUMS.part
0795fc420ad52e3f599d8b7e1c86c09fb7ca53a6171008cf8a6d205ddd273357  guix-build-7f5ac4520d15/output/riscv64-linux-gnu/bitcoin-7f5ac4520d15-riscv64-linux-gnu-debug.tar.gz
4cc70dd8da7b48ad810f14190a19e1475a58f753922f177943449806af550387  guix-build-7f5ac4520d15/output/riscv64-linux-gnu/bitcoin-7f5ac4520d15-riscv64-linux-gnu.tar.gz
af2d4af34b801209a85b8ef6d149f5fa152348134ea9abe7e38cb50d5e5f4b85  guix-build-7f5ac4520d15/output/x86_64-apple-darwin/SHA256SUMS.part
7066c328aac9138479a174e5b62fad4dce68a2a225ca9639020a9567a0e3022a  guix-build-7f5ac4520d15/output/x86_64-apple-darwin/bitcoin-7f5ac4520d15-x86_64-apple-darwin-unsigned.tar.gz
fd2301f76637d62912130996bd6f9d6162f934bf8ba7cea32b8508f90bc59e75  guix-build-7f5ac4520d15/output/x86_64-apple-darwin/bitcoin-7f5ac4520d15-x86_64-apple-darwin-unsigned.zip
cbbfa6d6b2e4530071164f87389a0e55104417f0123d8bff29d519f72a992f7a  guix-build-7f5ac4520d15/output/x86_64-apple-darwin/bitcoin-7f5ac4520d15-x86_64-apple-darwin.tar.gz
33c2e40a65b0ad415028ff6d01a568bd566bd677ae078dc0aac6b347e72ac7f7  guix-build-7f5ac4520d15/output/x86_64-linux-gnu/SHA256SUMS.part
b666cf8de8a98019b7d18511cb4ed3bc85b0a0e44af669754c0d3306e8925341  guix-build-7f5ac4520d15/output/x86_64-linux-gnu/bitcoin-7f5ac4520d15-x86_64-linux-gnu-debug.tar.gz
570e71ac049b8093a4b4afdb45a24e694585d8587c09db53687630da97b3b1c9  guix-build-7f5ac4520d15/output/x86_64-linux-gnu/bitcoin-7f5ac4520d15-x86_64-linux-gnu.tar.gz
c120be9d2aa8b5883f0ef8762b5e3093a8d0a2f034b456750085fe1f50dca455  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/SHA256SUMS.part
91433dd01de315488753edc3e13f7300c53231eb3e7dab55d233631b95a33e9f  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/bitcoin-7f5ac4520d15-win64-debug.zip
0748410dd75c764c443fe519398ede89b70857f6f6a58cbb12e1d9cf7ce42d20  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/bitcoin-7f5ac4520d15-win64-setup-unsigned.exe
bd9edbc9dd51a147175bef1443e1c2b419b804252c2b0ef14ae49639381586bc  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/bitcoin-7f5ac4520d15-win64-unsigned.tar.gz
8d74c85baaedaf9dadec59cf68babd56cc6869eca6eae3fce494453dd80c99d4  guix-build-7f5ac4520d15/output/x86_64-w64-mingw32/bitcoin-7f5ac4520d15-win64.zip

hebasto
hebasto approved these changes May 10, 2024
View reviewed changes
Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

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

ACK 7f5ac45.

After migration to CMake, there is a possibility that CMake will expect to find otool for the "Darwin" systems. But we can deal with this in due time.

@fanquake fanquake merged commit 4d3f1d0 into bitcoin:master May 11, 2024
@fanquake fanquake deleted the swap_otool_llvm_objdump branch May 11, 2024 10:37
@hebasto hebasto mentioned this pull request May 20, 2024
Closed
@hebasto
Copy link
Member

hebasto commented May 20, 2024

Ported to the CMake-based build system in hebasto#202.

kwvg added a commit to kwvg/dash that referenced this pull request Nov 15, 2024
@kwvg
merge bitcoin#29739: swap cctools otool for llvm-objdump
64be344
kwvg added a commit to kwvg/dash that referenced this pull request Nov 16, 2024
@kwvg
merge bitcoin#29739: swap cctools otool for llvm-objdump
aec8b48
kwvg added a commit to kwvg/dash that referenced this pull request Nov 17, 2024
@kwvg
merge bitcoin#29739: swap cctools otool for llvm-objdump
decd420
PastaPastaPasta added a commit to dashpay/dash that referenced this pull request Nov 17, 2024
@PastaPastaPasta
Merge #6385: backport: merge bitcoin#24241, bitcoin#24534, bitcoin#24948
6a51ab2 
, bitcoin#28622, bitcoin#28880, bitcoin#29185, bitcoin#29170, bitcoin#29233, bitcoin#29298, bitcoin#29598, bitcoin#29732, bitcoin#29890, bitcoin#29739, bitcoin#30074, bitcoin#30198, bitcoin#29072 (toolchain backports: part 2)

1506d9d merge bitcoin#29072: use `-no_exported_symbols` on macOS (Kittywhiskers Van Gogh)
9247960 merge bitcoin#30198: qt 5.15.14 and fix macOS build with Clang 18 (Kittywhiskers Van Gogh)
5585e7a merge bitcoin#30074: use ENV flags in get_arch (Kittywhiskers Van Gogh)
decd420 merge bitcoin#29739: swap cctools otool for llvm-objdump (Kittywhiskers Van Gogh)
0f8c420 merge bitcoin#29890: remove some tools when cross-compiling for macOS (Kittywhiskers Van Gogh)
936da1a merge bitcoin#29732: qt 5.15.13 (Kittywhiskers Van Gogh)
c294b47 revert: patch qt to make placeholders differ from actual text (Kittywhiskers Van Gogh)
af7090c merge bitcoin#29598: don't use -h with touch on OpenBSD (Kittywhiskers Van Gogh)
ebf8ff2 merge bitcoin#29298: patch libtool out of libnatpmp/miniupnpc (Kittywhiskers Van Gogh)
070b876 merge bitcoin#29233: depends move macOS C(XX) FLAGS out of C & CXX (Kittywhiskers Van Gogh)
d838481 revert dash#2398: Force fvisibility=hidden when compiling on macos (Kittywhiskers Van Gogh)
59a18f9 merge bitcoin#29170: add macho branch protection check (Kittywhiskers Van Gogh)
cb024d9 merge bitcoin#29185: remove `--enable-lto` (Kittywhiskers Van Gogh)
6d75a81 merge bitcoin#28880: switch to using LLVM 17.x for macOS builds (Kittywhiskers Van Gogh)
7b0a1f2 merge bitcoin#28622: use macOS 14 SDK (Xcode 15.0) (Kittywhiskers Van Gogh)
02eb735 merge bitcoin#24948: fix typo in permissions (Kittywhiskers Van Gogh)
2739107 merge bitcoin#24534: make gen-sdk deterministic (Kittywhiskers Van Gogh)
ab10bf9 merge bitcoin#24241: cleanup doc on need of Developer Account to obtain macOS SDK (Kittywhiskers Van Gogh)

Pull request description:

  ## Additional Information

  * Dependent on #6384
  * Dependency for #6389
  * The Qt patch introduced in [dash#5596](#5596), `fix_qt_placeholders.patch`, was a portion of a suggested workaround for QTBUG-92199 ([source](https://bugreports.qt.io/browse/QTBUG-92199?focusedId=669719&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-669719)) but since then, a fix ([here](https://codereview.qt-project.org/c/qt/qtbase/+/434310)) has made its way to 5.15.12 and we are upgrading to 5.15.14 from 5.15.11.

    So we can safely remove this patch.

  ## 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
  - [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 1506d9d
  PastaPastaPasta:
    utACK 1506d9d

Tree-SHA512: df8e4ea0ce9e7b269d248518698f0566b5eca1a54cdfb53f5b213b90fb5177e5a5df44eaeb6f3fc014cd93351c9245736bb2fd52bc2af4ae274d8fa93e601b07
Fabcien pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Nov 30, 2024
@fanquake @Fabcien
build: swap otool for (llvm-)objdump
4c7d024 
Summary:
```
Similar to libtool, (llvm-)otool only exists with a version suffix
on some systems (Ubuntu), which makes it annoying to use/find. Avoid
this, by switching to objdump. Which is a drop-in replacement.

This is related to #21778, and the switchover to using vanilla LLVM for
macOS.
```

Backport of [[bitcoin/bitcoin#29739 | core#29739]].

Depends on D17258.

Test Plan: Run the GUIX osx build

Reviewers: #bitcoin_abc, PiRK

Reviewed By: #bitcoin_abc, PiRK

Subscribers: PiRK

Differential Revision: https://reviews.bitcoinabc.org/D17259
roqqit pushed a commit to doged-io/doged that referenced this pull request Dec 19, 2024
@fanquake @roqqit
build: swap otool for (llvm-)objdump
3651adf 
Summary:
```
Similar to libtool, (llvm-)otool only exists with a version suffix
on some systems (Ubuntu), which makes it annoying to use/find. Avoid
this, by switching to objdump. Which is a drop-in replacement.

This is related to #21778, and the switchover to using vanilla LLVM for
macOS.
```

Backport of [[bitcoin/bitcoin#29739 | core#29739]].

Depends on D17258.

Test Plan: Run the GUIX osx build

Reviewers: #bitcoin_abc, PiRK

Reviewed By: #bitcoin_abc, PiRK

Subscribers: PiRK

Differential Revision: https://reviews.bitcoinabc.org/D17259
@bitcoin bitcoin locked and limited conversation to collaborators May 20, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@hebasto hebasto hebasto approved these changes

+2 more reviewers

@theuni theuni theuni approved these changes

@TheCharlatan TheCharlatan TheCharlatan approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
Build system
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@fanquake @DrahtBot @Sjors @TheCharlatan @hebasto @theuni @maflcko