8000 build: switch to upstream libdmg-hfsplus by fanquake · Pull Request #17057 · bitcoin/bitcoin · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

build: switch to upstream libdmg-hfsplus #17057

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.

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

Merged
merged 2 commits into from
Oct 14, 2019

Conversation

fanquake
Copy link
Member
@fanquake fanquake commented Oct 4, 2019

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 repo. I've added the last of Corys patches into depends.

Switching back to upstream discussion.

@laanwj
Copy link
Member
laanwj commented Oct 6, 2019

Concept ACK

@laanwj
Copy link
Member
laanwj commented Oct 8, 2019

Can someone please check the resulting .dmg file above, on a Mac?

@jonasschnelli
Copy link
Contributor
jonasschnelli commented Oct 8, 2019

I checked the dmg from @DrahtBot's gitian build and it looks good.
EDIT: I checked the master instead of the master+this-PR's dmg (which is missing)

Though my own gitian build failed:
https://bitcoin.jonasschnelli.ch/build/1251

....
+ OSX_VOLNAME=Bitcoin-Core
+ mkdir -p unsigned-app-x86_64-apple-darwin14
+ cp osx_volname unsigned-app-x86_64-apple-darwin14/
+ cp contrib/macdeploy/detached-sig-apply.sh unsigned-app-x86_64-apple-darwin14
+ cp contrib/macdeploy/detached-sig-create.sh unsigned-app-x86_64-apple-darwin14
+ cp /home/ubuntu/build/bitcoin/depends/x86_64-apple-darwin14/native/bin/dmg /home/ubuntu/build/bitcoin/depends/x86_64-apple-darwin14/native/bin/genisoimage unsigned-app-x86_64-apple-darwin14
cp: cannot stat '/home/ubuntu/build/bitcoin/depends/x86_64-apple-darwin14/native/bin/dmg': No such file or directory
Failed run an application inside container

@dongcarl
Copy link
Contributor
dongcarl commented Oct 8, 2019

Getting the same error, some clue from my docker container:

root@b7b23ed5f2d6:/home/ubuntu/build/bitcoin/depends/x86_64-apple-darwin16/native/bin# ls
bin           x86_64-apple-darwin16-ObjectDump         x86_64-apple-darwin16-indr               x86_64-apple-darwin16-ranlib
clang         x86_64-apple-darwin16-ar                 x86_64-apple-darwin16-inout              x86_64-apple-darwin16-redo_prebinding
clang++       x86_64-apple-darwin16-as                 x86_64-apple-darwin16-install_name_tool  x86_64-apple-darwin16-seg_addr_table
genisoimage   x86_64-apple-darwin16-bitcode_strip      x86_64-apple-darwin16-ld                 x86_64-apple-darwin16-seg_hack
lrelease      x86_64-apple-darwin16-check_dylib        x86_64-apple-darwin16-libtool            x86_64-apple-darwin16-segedit
lupdate       x86_64-apple-darwin16-checksyms          x86_64-apple-darwin16-lipo               x86_64-apple-darwin16-size
moc           x86_64-apple-darwin16-cmpdylib           x86_64-apple-darwin16-machocheck         x86_64-apple-darwin16-strings
qdbuscpp2xml  x86_64-apple-darwin16-codesign_allocate  x86_64-apple-darwin16-nm                 x86_64-apple-darwin16-strip
qdbusxml2cpp  x86_64-apple-darwin16-ctf_insert         x86_64-apple-darwin16-nmedit             x86_64-apple-darwin16-unwinddump
rcc           x86_64-apple-darwin16-dsymutil           x86_64-apple-darwin16-otool
uic           x86_64-apple-darwin16-dyldinfo           x86_64-apple-darwin16-pagestuff
root@b7b23ed5f2d6:/home/ubuntu/build/bitcoin/depends/x86_64-apple-darwin16/native/bin# ls bin
dmg

It would seem that dmg was installed to depends/x86_64-apple-darwin16/native/bin/bin (note the double bin)

@jonasschnelli
Copy link
Contributor

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.

@maflcko
Copy link
Member
maflcko commented Oct 9, 2019

Jup, failure was:

  AR       qt/libbitcoinqt.a
make[2]: Leaving directory '/home/ubuntu/build/bitcoin/distsrc-x86_64-apple-darwin14/src'
make[1]: Leaving directory '/home/ubuntu/build/bitcoin/distsrc-x86_64-apple-darwin14/src'
Making all in doc/man
make[1]: Entering directory '/home/ubuntu/build/bitcoin/distsrc-x86_64-apple-darwin14/doc/man'
make[1]: Nothing to be done for 'all'.
make[1]: Leaving directory '/home/ubuntu/build/bitcoin/distsrc-x86_64-apple-darwin14/doc/man'
make[1]: Entering directory '/home/ubuntu/build/bitcoin/distsrc-x86_64-apple-darwin14'
make[1]: Nothing to be done for 'all-am'.
make[1]: Leaving directory '/home/ubuntu/build/bitcoin/distsrc-x86_64-apple-darwin14'
/bin/mkdir -p Bitcoin-Qt.app/Contents/MacOS
STRIPPROG="/home/ubuntu/build/bitcoin/depends/x86_64-apple-darwin14/share/../native/bin/x86_64-apple-darwin14-strip" /bin/bash /home/ubuntu/build/bitcoin/distsrc-x86_64-apple-darwin14/build-aux/install-sh -c -s  ./src/qt/bitcoin-qt Bitcoin-Qt.app/Contents/MacOS/Bitcoin-Qt
/bin/mkdir -p Bitcoin-Qt.app/Contents/Resources/Base.lproj
echo '{	CFBundleDisplayName = "Bitcoin Core"; CFBundleName = "Bitcoin Core"; }' > Bitcoin-Qt.app/Contents/Resources/Base.lproj/InfoPlist.strings
INSTALLNAMETOOL=/home/ubuntu/build/bitcoin/depends/x86_64-apple-darwin14/share/../native/bin/x86_64-apple-darwin14-install_name_tool  OTOOL=/home/ubuntu/build/bitcoin/depends/x86_64-apple-darwin14/share/../native/bin/x86_64-apple-darwin14-otool STRIP=/home/ubuntu/build/bitcoin/depends/x86_64-apple-darwin14/share/../native/bin/x86_64-apple-darwin14-strip /usr/bin/python3.6 ./contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -translations-dir=/home/ubuntu/build/bitcoin/depends/x86_64-apple-darwin14/share/../translations -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -verbose 2
Warning: Could not detect Qt's path, skipping plugin deployment!
+ Copying source bundle +
+ Deploying frameworks +
Warning: Could not find any external frameworks to deploy in dist/Bitcoin-Qt.app.
+ Installing qt.conf +
+ Adding Qt translations +
+ Done +
/bin/mkdir -p dist/.background
/usr/bin/tiffcp -c none dpi36.background.tiff dpi72.background.tiff dist/.background/background.tiff
/usr/bin/python3.6 contrib/macdeploy/custom_dsstore.py "dist/.DS_Store" "Bitcoin-Core"
++ cat osx_volname
+ OSX_VOLNAME=Bitcoin-Core
+ mkdir -p unsigned-app-x86_64-apple-darwin14
+ cp osx_volname unsigned-app-x86_64-apple-darwin14/
+ cp contrib/macdeploy/detached-sig-apply.sh unsigned-app-x86_64-apple-darwin14
+ cp contrib/macdeploy/detached-sig-create.sh unsigned-app-x86_64-apple-darwin14
+ cp /home/ubuntu/build/bitcoin/depends/x86_64-apple-darwin14/native/bin/dmg /home/ubuntu/build/bitcoin/depends/x86_64-apple-darwin14/native/bin/genisoimage unsigned-app-x86_64-apple-darwin14
cp: cannot stat '/home/ubuntu/build/bitcoin/depends/x86_64-apple-darwin14/native/bin/dmg': No such file or directory

@maflcko
Copy link
Member
maflcko commented Oct 9, 2019

@fanquake Does this require a new sdk or something?

@dongcarl
Copy link
Contributor
dongcarl commented Oct 9, 2019

@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

@fanquake
Copy link
Member Author
fanquake commented Oct 9, 2019

Thanks for the testing. I'd been make deploying on Debian to test the built DMGs back on macOS, and had missed the upstream bin changes. Have rebased, fixed DCMAKE_INSTALL_PREFIX and queued a new gitian build.

Does this require a new sdk or something?

No this doesn't require any changes to our required macOS SDK.

@bitcoin bitcoin deleted a comment from DrahtBot Oct 9, 2019
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, looks good to me!

@DrahtBot
Copy link
Contributor

Gitian builds for commit f4d9307 (master):

Gitian builds for commit bfdc3ba (master and this pull):

@bitcoin bitcoin deleted a comment from DrahtBot Oct 12, 2019
laanwj added a commit that referenced this pull request Oct 14, 2019
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
@laanwj laanwj merged commit 9192ce5 into bitcoin:master Oct 14, 2019
@fanquake fanquake deleted the upstream_libdmg_hfsplus branch October 14, 2019 13:31
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Oct 15, 2019
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
deadalnix pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Apr 3, 2020
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
ftrader pushed a commit to bitcoin-cash-node/bitcoin-cash-node that referenced this pull request Aug 17, 2020
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
furszy added a commit to PIVX-Project/PIVX that referenced this pull request May 25, 2021
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
kwvg added a commit to kwvg/dash that referenced this pull request Jul 15, 2021
kwvg added a commit to kwvg/dash that referenced this pull request Jul 15, 2021
kwvg added a commit to kwvg/dash that referenced this pull request Jul 20, 2021
kwvg added a commit to kwvg/dash that referenced this pull request Jul 20, 2021
kwvg added a commit to kwvg/dash that referenced this pull request Jul 20, 2021
kwvg added a commit to kwvg/dash that referenced this pull request Jul 20, 2021
kwvg added a commit to kwvg/dash that referenced this pull request Aug 1, 2021
kwvg added a commit to kwvg/dash that referenced this pull request Aug 24, 2021
kwvg added a commit to kwvg/dash that referenced this pull request Aug 24, 2021
kwvg added a commit to kwvg/dash that referenced this pull request Aug 25, 2021
kwvg added a commit to kwvg/dash that referenced this pull request Aug 26, 2021
kwvg added a commit to kwvg/dash that referenced this pull request Aug 26, 2021
kwvg added a commit to kwvg/dash that referenced this pull request Aug 27, 2021
kwvg added a commit to kwvg/dash that referenced this pull request Aug 30, 2021
kwvg added a commit to kwvg/dash that referenced this pull request Aug 31, 2021
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Dec 16, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in. < 6672 /div>
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants
0