build: switch to upstream libdmg-hfsplus #17057

pull fanquake wants to merge 2 commits into bitcoin:master from fanquake:upstream_libdmg_hfsplus changing 4 files +886 −665
  1. fanquake commented at 7:54 pm on October 4, 2019: member

    Pulled the first two commits off #16392, as they are standalone.

    Corys PRs (https://github.com/planetbeing/libdmg-hfsplus/pull/7, https://github.com/planetbeing/libdmg-hfsplus/pull/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.

  2. fanquake added the label macOS on Oct 4, 2019
  3. fanquake added the label Build system on Oct 4, 2019
  4. fanquake added the label Needs gitian build on Oct 4, 2019
  5. DrahtBot removed the label Needs gitian build on Oct 6, 2019
  6. laanwj commented at 9:42 am on October 6, 2019: member
    Concept ACK
  7. laanwj commented at 8:26 am on October 8, 2019: member
    Can someone please check the resulting .dmg file above, on a Mac?
  8. jonasschnelli commented at 8:51 am on October 8, 2019: contributor

    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

    0....
1+ OSX_VOLNAME=Bitcoin-Core
2+ mkdir -p unsigned-app-x86_64-apple-darwin14
3+ cp osx_volname unsigned-app-x86_64-apple-darwin14/
4+ cp contrib/macdeploy/detached-sig-apply.sh unsigned-app-x86_64-apple-darwin14
5+ cp contrib/macdeploy/detached-sig-create.sh unsigned-app-x86_64-apple-darwin14
6+ 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
7cp: cannot stat '/home/ubuntu/build/bitcoin/depends/x86_64-apple-darwin14/native/bin/dmg': No such file or directory
8Failed run an application inside container
  9. dongcarl commented at 8:28 pm on October 8, 2019: member

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

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

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

  10. jonasschnelli commented at 7:11 am on October 9, 2019: 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.

  11. MarcoFalke commented at 2:34 pm on October 9, 2019: member

    Jup, failure was:

     0  AR       qt/libbitcoinqt.a
 1make[2]: Leaving directory '/home/ubuntu/build/bitcoin/distsrc-x86_64-apple-darwin14/src'
 2make[1]: Leaving directory '/home/ubuntu/build/bitcoin/distsrc-x86_64-apple-darwin14/src'
 3Making all in doc/man
 4make[1]: Entering directory '/home/ubuntu/build/bitcoin/distsrc-x86_64-apple-darwin14/doc/man'
 5make[1]: Nothing to be done for 'all'.
 6make[1]: Leaving directory '/home/ubuntu/build/bitcoin/distsrc-x86_64-apple-darwin14/doc/man'
 7make[1]: Entering directory '/home/ubuntu/build/bitcoin/distsrc-x86_64-apple-darwin14'
 8make[1]: Nothing to be done for 'all-am'.
 9make[1]: Leaving directory '/home/ubuntu/build/bitcoin/distsrc-x86_64-apple-darwin14'
10/bin/mkdir -p Bitcoin-Qt.app/Contents/MacOS
11STRIPPROG="/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
12/bin/mkdir -p Bitcoin-Qt.app/Contents/Resources/Base.lproj
13echo '{	CFBundleDisplayName = "Bitcoin Core"; CFBundleName = "Bitcoin Core"; }' > Bitcoin-Qt.app/Contents/Resources/Base.lproj/InfoPlist.strings
14INSTALLNAMETOOL=/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
15Warning: Could not detect Qt's path, skipping plugin deployment!
16+ Copying source bundle +
17+ Deploying frameworks +
18Warning: Could not find any external frameworks to deploy in dist/Bitcoin-Qt.app.
19+ Installing qt.conf +
20+ Adding Qt translations +
21+ Done +
22/bin/mkdir -p dist/.background
23/usr/bin/tiffcp -c none dpi36.background.tiff dpi72.background.tiff dist/.background/background.tiff
24/usr/bin/python3.6 contrib/macdeploy/custom_dsstore.py "dist/.DS_Store" "Bitcoin-Core"
25++ cat osx_volname
26+ OSX_VOLNAME=Bitcoin-Core
27+ mkdir -p unsigned-app-x86_64-apple-darwin14
28+ cp osx_volname unsigned-app-x86_64-apple-darwin14/
29+ cp contrib/macdeploy/detached-sig-apply.sh unsigned-app-x86_64-apple-darwin14
30+ cp contrib/macdeploy/detached-sig-create.sh unsigned-app-x86_64-apple-darwin14
31+ 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
32cp: cannot stat '/home/ubuntu/build/bitcoin/depends/x86_64-apple-darwin14/native/bin/dmg': No such file or directory
  12. MarcoFalke commented at 2:36 pm on October 9, 2019: member
    @fanquake Does this require a new sdk or something?
  13. depends: latest config.guess & config.sub 9b54f3436b
  14. depends: pull upstream libdmg-hfsplus changes 9192ce5d63
  16. fanquake force-pushed on Oct 9, 2019
  17. fanquake added the label Needs gitian build on Oct 9, 2019
  18. fanquake commented at 2:56 pm on October 9, 2019: member

    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.

  19. MarcoFalke deleted a comment on Oct 9, 2019
  20. DrahtBot removed the label Needs gitian build on Oct 9, 2019
  21. theuni approved
  22. theuni commented at 2:56 pm on October 11, 2019: member
    ACK, looks good to me!
  23. MarcoFalke added the label Needs gitian build on Oct 11, 2019
  24. DrahtBot commented at 8:47 am on October 12, 2019: member

    Gitian builds for commit f4d93078dde502bb6a77dcc94ac6eafe20e36324 (master):

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

  25. DrahtBot removed the label Needs gitian build on Oct 12, 2019
  26. MarcoFalke deleted a comment on Oct 12, 2019
  27. laanwj referenced this in commit d882f63589 on Oct 14, 2019
  28. laanwj merged this on Oct 14, 2019
  29. laanwj closed this on Oct 14, 2019
  30. fanquake deleted the branch on Oct 14, 2019
  31. sidhujag referenced this in commit ecad5267fa on Oct 15, 2019
  32. deadalnix referenced this in commit 25097d2ce7 on Apr 3, 2020
  33. ftrader referenced this in commit 212022bdad on Aug 17, 2020
  34. furszy referenced this in commit 816f42d7ac on May 25, 2021
  35. kittywhiskers referenced this in commit 8e0c3a5907 on Jul 15, 2021
  36. kittywhiskers referenced this in commit 0650f5c69e on Jul 15, 2021
  37. kittywhiskers referenced this in commit 41a0ac78e4 on Jul 20, 2021
  38. kittywhiskers referenced this in commit 37c457e9ac on Jul 20, 2021
  39. kittywhiskers referenced this in commit edf6adb879 on Jul 20, 2021
  40. kittywhiskers referenced this in commit 1253a9b10c on Jul 20, 2021
  41. kittywhiskers referenced this in commit 9fb2452a71 on Aug 1, 2021
  42. kittywhiskers referenced this in commit 46911af842 on Aug 24, 2021
  43. kittywhiskers referenced this in commit 06cfa38025 on Aug 24, 2021
  44. kittywhiskers referenced this in commit 5d4030bff2 on Aug 25, 2021
  45. kittywhiskers referenced this in commit 74bc9246ae on Aug 26, 2021
  46. kittywhiskers referenced this in commit 4f4796b854 on Aug 26, 2021
  47. kittywhiskers referenced this in commit b7f1f99a60 on Aug 27, 2021
  48. kittywhiskers referenced this in commit ca99df894b on Aug 30, 2021
  49. kittywhiskers referenced this in commit d5b895bb3c on Aug 31, 2021
  50. MarcoFalke locked this on Dec 16, 2021


fanquake laanwj jonasschnelli dongcarl MarcoFalke theuni DrahtBot

Labels
macOS Build system

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-11-21 12:12 UTC
This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me