build: switch to upstream libdmg-hfsplus#17057
Conversation
|
Concept ACK |
|
Can someone please check the resulting |
|
Though my own gitian build failed: |
|
Getting the same error, some clue from my docker container: It would seem that |
|
Oh. I tested the wrong dmg of @DrahtBot's gitian build (tested master). I edited my comment above. Drath's OSX build did also fail. |
|
Jup, failure was: |
|
@fanquake Does this require a new sdk or something? |
|
@MarcoFalke @jonasschnelli Sorry, I should have posted here as well... I fixed this in fanquake/bitcoin@329af88...dongcarl:2019-10-fixing-fanquake-osx-bump, specifically fanquake@a24ba3a |
2a671db to
9192ce5
Compare
|
Thanks for the testing. I'd been
No this doesn't require any changes to our required macOS SDK. |
|
Gitian builds for commit f4d9307 (master):
Gitian builds for commit bfdc3baab0f418cfbbc01e1f8e3a719cf0e47132 (master and this pull):
|
9192ce5 depends: pull upstream libdmg-hfsplus changes (fanquake) 9b54f34 depends: latest config.guess & config.sub (fanquake) Pull request description: Pulled the first two commits off #16392, as they are standalone. Corys PRs (planetbeing/libdmg-hfsplus#7, planetbeing/libdmg-hfsplus#8) have been merged, and the author was active for a little while in 2017/18, so switch back to the upstream [`libdmg-hfsplus`](https://github.com/planetbeing/libdmg-hfsplus) repo. I've added the last of Corys patches into depends. [Switching back to upstream discussion](#16392 (comment)). Top commit has no ACKs. Tree-SHA512: a2313a731242251fef28921faf403c9bc354e6271cd7a26e9904ff5fae5766678136697fb5696006498a982ce319747b52b1df5151837388cda8f8145b45ab7c
9192ce5 depends: pull upstream libdmg-hfsplus changes (fanquake) 9b54f34 depends: latest config.guess & config.sub (fanquake) Pull request description: Pulled the first two commits off bitcoin#16392, as they are standalone. Corys PRs (planetbeing/libdmg-hfsplus#7, planetbeing/libdmg-hfsplus#8) have been merged, and the author was active for a little while in 2017/18, so switch back to the upstream [`libdmg-hfsplus`](https://github.com/planetbeing/libdmg-hfsplus) repo. I've added the last of Corys patches into depends. [Switching back to upstream discussion](bitcoin#16392 (comment)). Top commit has no ACKs. Tree-SHA512: a2313a731242251fef28921faf403c9bc354e6271cd7a26e9904ff5fae5766678136697fb5696006498a982ce319747b52b1df5151837388cda8f8145b45ab7c
Summary: ``` Corys PRs (planetbeing/libdmg-hfsplus#7, planetbeing/libdmg-hfsplus#8) have been merged, and the author was active for a little while in 2017/18, so switch back to the upstream libdmg-hfsplus repo. I've added the last of Corys patches into depends. ``` Backport of core [[bitcoin/bitcoin#17057 | PR17057]]. Depends on D5653. The config.guess and config.sub scripts had no merge conflict. Test Plan: Run the OSX Gitian build. Reviewers: #bitcoin_abc, deadalnix Reviewed By: #bitcoin_abc, deadalnix Differential Revision: https://reviews.bitcoinabc.org/D5654
Summary: ``` Corys PRs (planetbeing/libdmg-hfsplus#7, planetbeing/libdmg-hfsplus#8) have been merged, and the author was active for a little while in 2017/18, so switch back to the upstream libdmg-hfsplus repo. I've added the last of Corys patches into depends. ``` Backport of core [[bitcoin/bitcoin#17057 | PR17057]]. Depends on D5653. The config.guess and config.sub scripts had no merge conflict. Test Plan: Run the OSX Gitian build. Reviewers: #bitcoin_abc, deadalnix Reviewed By: #bitcoin_abc, deadalnix Differential Revision: https://reviews.bitcoinabc.org/D5654
e1b89ac Fix QPainter non-determinism on macOS (Andrew Chow) 831c317 macOS deploy: use the new plistlib API (Jonas Schnelli) 5857aaf doc: Document ALLOW_HOST_PACKAGES dependency option (skmcontrib) 2329e08 build: Fix behavior when ALLOW_HOST_PACKAGES unset (Hennadii Stepanov) 1768870 depends: native_ds_store 1.3.0 (fanquake) 3f9f3e5 depends: pull upstream libdmg-hfsplus changes (fanquake) f7606dc depends: latest config.guess & config.sub (fanquake) cc3ae74 depends: bump native_cctools for fixed lto with external clang (Cory Fields) b26c648 depends: enable lto support for Apple's ld64 (Cory Fields) 50933d7 depends: Add documentation for FORCE_USE_SYSTEM_CLANG make flag (Carl Dong) ba3ddf2 depends: Reformat make options as definition list (Carl Dong) 3b855a7 depends: Add justifications for macOS clang flags (Carl Dong) 4104de0 depends: specify libc++ header location for darwin (Cory Fields) cd4335f depends: force a new host id string if FORCE_USE_SYSTEM_CLANG is in use (Cory Fields) d30e1af depends: Allow building with system clang (Carl Dong) 234828b depends: Decouple toolchain + binutils (Carl Dong) 1dd3a5a doc: explain why passing -mlinker-version is required (fanquake) 5cc0d0f darwin: pass mlinker-version so that clang enables new features (Cory Fields) 813a552 macos: Bump to xcode 11.3.1 and 10.15 SDK (Cory Fields) ee7085f depends: bump MacOS toolchain (Cory Fields) e5b092b contrib: macdeploy: Remove historical extraction notes (Carl Dong) 5893caf contrib: macdeploy: Use apple-sdk-tools instead of xar+pbzx (Carl Dong) 9f2d4ba native_cctools: Don't use libc++ from pinned clang (Carl Dong) 0c8d217 Adapt rest of tooling to new SDK naming scheme (Carl Dong) bdacfa8 contrib: macdeploy: Correctly generate macOS SDK (Carl Dong) f7eee2c Fix naming of macOS SDK and clarify version (Andrew Chow) 62f9e23 build: use macOS 10.14 SDK (fanquake) bc2e1af depends: native_cctools 921, ld64 409.12, libtapi 1000.10.8 (fanquake) a296d87 depends: clang 6.0.1 (fanquake) 8f6c475 build: Set minimum supported macOS to 10.12 (Fuzzbawls) Pull request description: This backports the following upstream PRs to update the macOS cross-compiling tools: bitcoin#17550 bitcoin#16392 bitcoin#18589 bitcoin#19240 bitcoin#19407 bitcoin#17919 bitcoin#19530 bitcoin#17057 bitcoin#20333 bitcoin#18051 bitcoin#19124 bitcoin#20298 bitcoin#20447 The tools being updated are ### Clang Upgraded from `3.7.1` to `8.0.0` ### cctools * cctools `877.8` -> `949.0.1` * LD64 `253.9` -> `530` * TAPI `1000.10.8` ### DSStore Upgraded from `1.1.2` to `1.3.0` (this removes the biplist dependency) This also effectively bumps our minimum supported macOS version to 10.12 (Sierra). ACKs for top commit: furszy: tested ACK e1b89ac random-zebra: utACK e1b89ac Tree-SHA512: f5cec8db57e07d8855070646b9e1400d48aac1d01e3c2c3b3e134665c6372d6535f3328888bb9a75087f7b3d5231ecb4b509723bfa51bd40770ffe2810c67f65
Pulled the first two commits off #16392, as they are standalone.
Corys PRs (planetbeing/libdmg-hfsplus#7, planetbeing/libdmg-hfsplus#8) have been merged, and the author was active for a little while in 2017/18, so switch back to the upstream
libdmg-hfsplusrepo. I've added the last of Corys patches into depends.Switching back to upstream discussion.