Fix make deploy for arm64-darwin
Accidentally closed the PR
Fix make deploy for arm64-darwin
Guix builds:
0# find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
106a9f6c7511591cfbdecdfc38542b7a7a82a96bd4505c5466f66edc6dbbbd7ef guix-build-b353633bf488/output/dist-archive/bitcoin-b353633bf488.tar.gz
28d9d9d95d2610f62281dfe9aa9f052ad40928c1190795282161bdfde534cae01 guix-build-b353633bf488/output/x86_64-apple-darwin18/bitcoin-b353633bf488-osx-unsigned.dmg
30967d22eed7cf16fe43d8644cbb464c6a8dddfa430edbc013cbc55d360077a4f guix-build-b353633bf488/output/x86_64-apple-darwin18/bitcoin-b353633bf488-osx-unsigned.tar.gz
48d576325fd4a1ed91f6600ca5ab9b115cd3b17f081847889a3dcbd2018fd94ed guix-build-b353633bf488/output/x86_64-apple-darwin18/bitcoin-b353633bf488-osx64.tar.gz
Gitian builds:
0# macOS:
1Generating report
2faa90ad8a2074514f21f320e6c174fa0878386b6192d655690de793dfe011f02 bitcoin-b353633bf488-osx-unsigned.dmg
36edf7ad125d358de3630a0c9fb9173713ceb87ff9a2832866a94ecee8da7e4fa bitcoin-b353633bf488-osx-unsigned.tar.gz
434d03ff373e326425984dc012d55e7f00bb1fa7b71bf054d63f0c9aea241a60f bitcoin-b353633bf488-osx64.tar.gz
506a9f6c7511591cfbdecdfc38542b7a7a82a96bd4505c5466f66edc6dbbbd7ef src/bitcoin-b353633bf488.tar.gz
6ed872033b8fc603d1fb97174e0b30962c5c11d519bf88be765326d35c532d59b bitcoin-core-osx-22-res.yml
7Done.
Can’t test. Here are my GUIX hashes, they line up with fanquake:
0find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
1
206a9f6c7511591cfbdecdfc38542b7a7a82a96bd4505c5466f66edc6dbbbd7ef guix-build-b353633bf488/output/dist-archive/bitcoin-b353633bf488.tar.gz
38d9d9d95d2610f62281dfe9aa9f052ad40928c1190795282161bdfde534cae01 guix-build-b353633bf488/output/x86_64-apple-darwin18/bitcoin-b353633bf488-osx-unsigned.dmg
40967d22eed7cf16fe43d8644cbb464c6a8dddfa430edbc013cbc55d360077a4f guix-build-b353633bf488/output/x86_64-apple-darwin18/bitcoin-b353633bf488-osx-unsigned.tar.gz
58d576325fd4a1ed91f6600ca5ab9b115cd3b17f081847889a3dcbd2018fd94ed guix-build-b353633bf488/output/x86_64-apple-darwin18/bitcoin-b353633bf488-osx64.tar.gz
Tested ACK b353633bf488fbd89b66f6c534d5f0f676c9cf6d.
The mac_alias
fix is https://github.com/al45tair/mac_alias/commit/2f96a9b897f75ff2c38eaa0efd2e40d39ae5f9ba which is in release 2.2.0.
Without this make deploy
fails:
0Traceback (most recent call last):
1 File "/Users/joao/Projects/bitcoin/./contrib/macdeploy/macdeployqtplus", line 22, in <module>
2 from ds_store import DSStore
3 File "/Users/joao/Projects/bitcoin/depends/arm-apple-darwin20.3.0/native/lib/python3/dist-packages/ds_store/__init__.py", line 1, in <module>
4 from .store import DSStore, DSStoreEntry
5 File "/Users/joao/Projects/bitcoin/depends/arm-apple-darwin20.3.0/native/lib/python3/dist-packages/ds_store/store.py", line 8, in <module>
6 import mac_alias
7 File "/Users/joao/Projects/bitcoin/depends/arm-apple-darwin20.3.0/native/lib/python3/dist-packages/mac_alias/__init__.py", line 1, in <module>
8 from .alias import *
9 File "/Users/joao/Projects/bitcoin/depends/arm-apple-darwin20.3.0/native/lib/python3/dist-packages/mac_alias/alias.py", line 16, in <module>
10 from . import osx
11 File "/Users/joao/Projects/bitcoin/depends/arm-apple-darwin20.3.0/native/lib/python3/dist-packages/mac_alias/osx.py", line 424, in <module>
12 _statfs = libc['statfs$INODE64']
13 File "/opt/homebrew/Cellar/python@3.9/3.9.4/Frameworks/Python.framework/Versions/3.9/lib/python3.9/ctypes/__init__.py", line 392, in __getitem__
14 func = self._FuncPtr((name_or_ordinal, self))
15AttributeError: dlsym(0x100a45810, statfs$INODE64): symbol not found
16make: *** [Bitcoin-Core.dmg] Error 1