Skip to content
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

build: switch to upstream libdmg-hfsplus #17057

Merged
merged 2 commits into from Oct 14, 2019

Conversation

@fanquake
Copy link
Member

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

This comment has been minimized.

Copy link
Member

commented Oct 6, 2019

Concept ACK

@laanwj

This comment has been minimized.

Copy link
Member

commented Oct 8, 2019

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

@jonasschnelli

This comment has been minimized.

Copy link
Member

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

This comment has been minimized.

Copy link
Contributor

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

This comment has been minimized.

Copy link
Member

commented Oct 9, 2019

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.

@MarcoFalke

This comment has been minimized.

Copy link
Member

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
@MarcoFalke

This comment has been minimized.

Copy link
Member

commented Oct 9, 2019

@fanquake Does this require a new sdk or something?

fanquake added 2 commits Jun 2, 2019
@dongcarl

This comment has been minimized.

Copy link
Contributor

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 fanquake force-pushed the fanquake:upstream_libdmg_hfsplus branch from 2a671db to 9192ce5 Oct 9, 2019
@fanquake

This comment has been minimized.

Copy link
Member Author

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
@theuni
theuni approved these changes Oct 11, 2019
Copy link
Member

left a comment

ACK, looks good to me!

@DrahtBot

This comment has been minimized.

Copy link
Contributor

commented Oct 12, 2019

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
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@fanquake fanquake deleted the fanquake:upstream_libdmg_hfsplus branch Oct 14, 2019
sidhujag added 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
7 participants
You can’t perform that action at this time.