build: fix make deploy for arm64-darwin #21658
Merged
Conversation
This file contains 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
Fix make deploy for arm64-darwin
|
Guix builds: # find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
06a9f6c7511591cfbdecdfc38542b7a7a82a96bd4505c5466f66edc6dbbbd7ef guix-build-b353633bf488/output/dist-archive/bitcoin-b353633bf488.tar.gz
8d9d9d95d2610f62281dfe9aa9f052ad40928c1190795282161bdfde534cae01 guix-build-b353633bf488/output/x86_64-apple-darwin18/bitcoin-b353633bf488-osx-unsigned.dmg
0967d22eed7cf16fe43d8644cbb464c6a8dddfa430edbc013cbc55d360077a4f guix-build-b353633bf488/output/x86_64-apple-darwin18/bitcoin-b353633bf488-osx-unsigned.tar.gz
8d576325fd4a1ed91f6600ca5ab9b115cd3b17f081847889a3dcbd2018fd94ed guix-build-b353633bf488/output/x86_64-apple-darwin18/bitcoin-b353633bf488-osx64.tar.gzGitian builds: # macOS:
Generating report
faa90ad8a2074514f21f320e6c174fa0878386b6192d655690de793dfe011f02 bitcoin-b353633bf488-osx-unsigned.dmg
6edf7ad125d358de3630a0c9fb9173713ceb87ff9a2832866a94ecee8da7e4fa bitcoin-b353633bf488-osx-unsigned.tar.gz
34d03ff373e326425984dc012d55e7f00bb1fa7b71bf054d63f0c9aea241a60f bitcoin-b353633bf488-osx64.tar.gz
06a9f6c7511591cfbdecdfc38542b7a7a82a96bd4505c5466f66edc6dbbbd7ef src/bitcoin-b353633bf488.tar.gz
ed872033b8fc603d1fb97174e0b30962c5c11d519bf88be765326d35c532d59b bitcoin-core-osx-22-res.yml
Done. |
jarolrod
reviewed
Apr 13, 2021
There was a problem hiding this comment.
Can't test. Here are my GUIX hashes, they line up with fanquake:
find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
06a9f6c7511591cfbdecdfc38542b7a7a82a96bd4505c5466f66edc6dbbbd7ef guix-build-b353633bf488/output/dist-archive/bitcoin-b353633bf488.tar.gz
8d9d9d95d2610f62281dfe9aa9f052ad40928c1190795282161bdfde534cae01 guix-build-b353633bf488/output/x86_64-apple-darwin18/bitcoin-b353633bf488-osx-unsigned.dmg
0967d22eed7cf16fe43d8644cbb464c6a8dddfa430edbc013cbc55d360077a4f guix-build-b353633bf488/output/x86_64-apple-darwin18/bitcoin-b353633bf488-osx-unsigned.tar.gz
8d576325fd4a1ed91f6600ca5ab9b115cd3b17f081847889a3dcbd2018fd94ed guix-build-b353633bf488/output/x86_64-apple-darwin18/bitcoin-b353633bf488-osx64.tar.gz
promag
reviewed
Apr 28, 2021
There was a problem hiding this comment.
Tested ACK b353633.
The mac_alias fix is dmgbuild/mac_alias@2f96a9b which is in release 2.2.0.
Without this make deploy fails:
Traceback (most recent call last):
File "/Users/joao/Projects/bitcoin/./contrib/macdeploy/macdeployqtplus", line 22, in <module>
from ds_store import DSStore
File "/Users/joao/Projects/bitcoin/depends/arm-apple-darwin20.3.0/native/lib/python3/dist-packages/ds_store/__init__.py", line 1, in <module>
from .store import DSStore, DSStoreEntry
File "/Users/joao/Projects/bitcoin/depends/arm-apple-darwin20.3.0/native/lib/python3/dist-packages/ds_store/store.py", line 8, in <module>
import mac_alias
File "/Users/joao/Projects/bitcoin/depends/arm-apple-darwin20.3.0/native/lib/python3/dist-packages/mac_alias/__init__.py", line 1, in <module>
from .alias import *
File "/Users/joao/Projects/bitcoin/depends/arm-apple-darwin20.3.0/native/lib/python3/dist-packages/mac_alias/alias.py", line 16, in <module>
from . import osx
File "/Users/joao/Projects/bitcoin/depends/arm-apple-darwin20.3.0/native/lib/python3/dist-packages/mac_alias/osx.py", line 424, in <module>
_statfs = libc['statfs$INODE64']
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__
func = self._FuncPtr((name_or_ordinal, self))
AttributeError: dlsym(0x100a45810, statfs$INODE64): symbol not found
make: *** [Bitcoin-Core.dmg] Error 1
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Apr 29, 2021
b353633 build: mac_alias 2.2.0 (sgulls) Pull request description: Fix make deploy for arm64-darwin Accidentally [closed](bitcoin#21555) the PR ACKs for top commit: promag: Tested ACK b353633. Tree-SHA512: 08043792d63894b6738ea93d076cecace1d8b30a623b944170a34492c3838269da87e09878164c760cf321663fb72641a7295070a847ad67d91fc9970ebe5c6a
barton2526
added a commit
to barton2526/Gridcoin-Research
that referenced
this pull request
Jun 10, 2021
Fixes a bug. Refer bitcoin/bitcoin#21658
barton2526
added a commit
to barton2526/Gridcoin-Research
that referenced
this pull request
Jun 10, 2021
Fixes a bug. Refer bitcoin/bitcoin#21658
random-zebra
added a commit
to random-zebra/PIVX
that referenced
this pull request
Jun 11, 2021
a68c7d5 depends: mac_alias 2.2.0 (fanquake) d8e2baf doc: Add explicit macdeployqtplus dependencies install step (Hennadii Stepanov) 013305d macdeploy: use Python 3.6 (fanquake) faf77c3 macdeploy: remove runHDIUtil in favor of directly calling subprocess.run (fanquake) 8bcfd58 macdeploy: remove existing PIVX-Core.dmg if present (fanquake) 023d3ca macdeploy: move qt_conf to where it's used (fanquake) 7cdb5bb macdeploy: consolidate .DS_Store generation (fanquake) 4da04d7 macdeploy: assume plistlib is available (fanquake) 56ab77a macdeploy: have a single level of logging output (fanquake) d111cdf macdeploy: remove add-resources argument (fanquake) 4312410 macdeploy: remove codesigning argument (fanquake) c2ee635 build: automatically determine macOS translations (fanquake) 1c44ecf scripts: filter more qt plugins we don't use in macdeployqtplus (fanquake) c854f78 scripts: misc cleanups in macdeployqtplus (fanquake) a3873ea scripts: use format() in macdeployqtplus (fanquake) a65bea5 scripts: add type annotations to macdeployqtplus (fanquake) ba179e5 build: Drop macports support (Ben Woosley) Pull request description: This is a companion to PIVX-Project#2272 that focuses on on the `.dmg` creation aspect of macOS builds (ie, `make deploy`). The following upstream PRs are backported here: - bitcoin#15175 - bitcoin#16477 - bitcoin#20422 - bitcoin#20890 - bitcoin#21658 Also worth mentioning: This drops support for MacPorts entirely, which has been antiquated and un-maintained for quite some time, and never actually used by any PIVX macOS build doc. ACKs for top commit: furszy: Tested using depends, ACK a68c7d5. random-zebra: utACK a68c7d5 and merging... Tree-SHA512: 3e9fa81a905ca3e90f07ff1213ec69dd1220a19a6a215f256ab67f2594476dc95e8fe88f15a1c9f3314b1757a7a2e5d8e6d7a790d85c117bf4236a3833757430
gwillen
pushed a commit
to ElementsProject/elements
that referenced
this pull request
Jun 1, 2022
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.
Fix make deploy for arm64-darwin
Accidentally closed the PR