depends: fix qt determinism #14000

pull theuni wants to merge 1 commits into bitcoin:master from theuni:fix-qt-determinism changing 2 files +29 −2
  1. theuni commented at 11:03 PM on August 17, 2018: member

    Thanks to @MarcoFalke for pointing out the problem and the solution as well. I'm unsure if this takes care of all of the determinism issues with 0.17rc1, but it should fix at least one.

    Qt's configure grabs the path to xkb's data root during configure, but the build changes in 5.8 apparently broke the handling for cross builds. As a result, the string embedded in the binary depends on whether or not some files are present in the builder's filesystem.

    The "-xkb-config-root" configure setting is intended to allow manual overriding but it is also broken. See: https://bugreports.qt.io/browse/QTBUG-60005

    This has since been fixed upstream, so just hard-code the path for now. We can drop this patch when we bump to a fixed Qt.

    Also, fix the "-qt-xkbcommon-x11" config param which was renamed. This does not appear to affect build results, presumably because auto-detection is working, but it does not hurt to be explicit.

    Edit: The hard-coded string matches the value from 0.16 builds, so nothing should be changing.

  2. depends: fix qt determinism
    Qt's configure grabs the path to xkb's data root during configure, but the
    build changes in 5.8 apparently broke the handling for cross builds. As a
    result, the string embedded in the binary depends on whether or not some files
    are present in the builder's filesystem.
    
    The "-xkb-config-root" configure setting is intended to allow manual overriding
    but it is also broken. See: https://bugreports.qt.io/browse/QTBUG-60005
    
    This has since been fixed upstream, so just hard-code the path for now. We can
    drop this patch when we bump to a fixed Qt.
    
    Also, fix the "-qt-xkbcommon-x11" config param which was renamed. This does not
    appear to affect build results, presumably because auto-detection is working,
    but it does not hurt to be explicit.
    de0b4fba2f
  3. fanquake added the label Build system on Aug 17, 2018
  4. fanquake added this to the milestone 0.17.0 on Aug 17, 2018
  5. MarcoFalke added the label Needs backport on Aug 18, 2018
  6. MarcoFalke commented at 12:06 AM on August 18, 2018: member

    utACK de0b4fba2fb5270dcc8d851243af9187b8ef191a on the patch (Can confirm that this was the value for the 0.16.2 build, as well as the value for lxc builds on 0.17.0, but not docker builds on 0.17.0)

  7. MarcoFalke added the label Needs gitian build on Aug 18, 2018
  8. MarcoFalke commented at 12:13 AM on August 18, 2018: member

    DrahtBot should be doing a gitian build on docker of 991dd820807450f37e48e474b4e2049d30922cc1, if no merges and commits to master happen in the meantime. For testing purposes, another gitian build should be done on lxc of commit 991dd820807450f37e48e474b4e2049d30922cc1.

  9. ken2812221 commented at 4:50 AM on August 18, 2018: contributor

    Note that master branch gitian setup is using g++-8, so it might have to be tested again on g++-7

    Tested ACK de0b4fb

    Tested on 991dd82 with no depends cache. LXC

    25f13366ade10e980d8a6ce90c6b521a8464f13bda2f93ef345aeb76bc003c4e  bitcoin-0.17.99-aarch64-linux-gnu-debug.tar.gz
    5e493a266b694a00f032375010c161cc2d7b135089cf7160e071b5d9c1aa76ad  bitcoin-0.17.99-aarch64-linux-gnu.tar.gz
    e6f9a8eba2d21e9b3247ae68a9c8958365ef273d378b10523709b61786669470  bitcoin-0.17.99-arm-linux-gnueabihf-debug.tar.gz
    9869fe4029b5c45354d3962d806d6295fbdac9349a353de24a906b913cee7cf5  bitcoin-0.17.99-arm-linux-gnueabihf.tar.gz
    a6fb684b06f805d927996f4babaeb48f246ab64af0a325e0e58202b7a732b253  bitcoin-0.17.99-i686-pc-linux-gnu-debug.tar.gz
    523925631a3e52fecdd2d67097dee3a41db0df58f0c6304edbcf1f489d5a780a  bitcoin-0.17.99-i686-pc-linux-gnu.tar.gz
    8640b651064b21183b059eca1f5778d7eead41c27c26a2f84e4c5958e1617267  bitcoin-0.17.99-riscv64-linux-gnu-debug.tar.gz
    49fa28518b8376bb41f67c1bc1537b891ee971231d4314858ca442e388b479ba  bitcoin-0.17.99-riscv64-linux-gnu.tar.gz
    953d4a3b065df682a1896799ca3b4d293c85697d1abb762f8153c46c6815a522  bitcoin-0.17.99-x86_64-linux-gnu-debug.tar.gz
    aaa8bdcfad7884d988c73497aeffef61078e6f3f4d28cb28869de2fd17b1fa06  bitcoin-0.17.99-x86_64-linux-gnu.tar.gz
    
    d2442f4ef274fbe4257689776d99bfb8eecf3f85c40c7f212c75fa12d2aa63d0  bitcoin-0.17.99-win-unsigned.tar.gz
    44a8cfaec79332fb4dd6674ecf291bf28b0a34e8c738982fb546367b36f79f6d  bitcoin-0.17.99-win32-debug.zip
    0e17e2b5e5ce7ad4945f15c74d930742db5fb67c5f7761666ea144438b28658f  bitcoin-0.17.99-win32-setup-unsigned.exe
    95699f643a356c312f7d00f4e9d188512d57bec12af927e0dea9e1ce2a885b23  bitcoin-0.17.99-win32.zip
    293cc8df29af3aaad9e821e59ef31c0aeb820caf5e4195de7c3a4c49bee0982b  bitcoin-0.17.99-win64-debug.zip
    3d3e89c399b0436a9ed642fba5671414182343810506d6acfeabd166e8bf23c2  bitcoin-0.17.99-win64-setup-unsigned.exe
    7c78fc980d9532eea4b67b5964bf7a9dc70d6df06aa685f4d14ae284a0c84d15  bitcoin-0.17.99-win64.zip
    
    5c96065b7e616adce74d8634e6edddb0f73d32998ef4edb6b912dff65d1929a9  bitcoin-0.17.99-osx-unsigned.dmg
    265ee59bff507a33c350c5187b864627a77fd56f649c58cc9257743792a6a22c  bitcoin-0.17.99-osx-unsigned.tar.gz
    af981f9cc289a094946e5be4e3012e16bd104eb68cb48eeec6386d4e7b19c424  bitcoin-0.17.99-osx64.tar.gz
    
    f3112792beb03c4411d887aaa52f3adf0798a302a2f2c69ed4a75c6894cc2104  src/bitcoin-0.17.99.tar.gz
    

    Docker

    25f13366ade10e980d8a6ce90c6b521a8464f13bda2f93ef345aeb76bc003c4e  bitcoin-0.17.99-aarch64-linux-gnu-debug.tar.gz
    5e493a266b694a00f032375010c161cc2d7b135089cf7160e071b5d9c1aa76ad  bitcoin-0.17.99-aarch64-linux-gnu.tar.gz
    e6f9a8eba2d21e9b3247ae68a9c8958365ef273d378b10523709b61786669470  bitcoin-0.17.99-arm-linux-gnueabihf-debug.tar.gz
    9869fe4029b5c45354d3962d806d6295fbdac9349a353de24a906b913cee7cf5  bitcoin-0.17.99-arm-linux-gnueabihf.tar.gz
    a6fb684b06f805d927996f4babaeb48f246ab64af0a325e0e58202b7a732b253  bitcoin-0.17.99-i686-pc-linux-gnu-debug.tar.gz
    523925631a3e52fecdd2d67097dee3a41db0df58f0c6304edbcf1f489d5a780a  bitcoin-0.17.99-i686-pc-linux-gnu.tar.gz
    8640b651064b21183b059eca1f5778d7eead41c27c26a2f84e4c5958e1617267  bitcoin-0.17.99-riscv64-linux-gnu-debug.tar.gz
    49fa28518b8376bb41f67c1bc1537b891ee971231d4314858ca442e388b479ba  bitcoin-0.17.99-riscv64-linux-gnu.tar.gz
    953d4a3b065df682a1896799ca3b4d293c85697d1abb762f8153c46c6815a522  bitcoin-0.17.99-x86_64-linux-gnu-debug.tar.gz
    aaa8bdcfad7884d988c73497aeffef61078e6f3f4d28cb28869de2fd17b1fa06  bitcoin-0.17.99-x86_64-linux-gnu.tar.gz
    
    d2442f4ef274fbe4257689776d99bfb8eecf3f85c40c7f212c75fa12d2aa63d0  bitcoin-0.17.99-win-unsigned.tar.gz
    44a8cfaec79332fb4dd6674ecf291bf28b0a34e8c738982fb546367b36f79f6d  bitcoin-0.17.99-win32-debug.zip
    0e17e2b5e5ce7ad4945f15c74d930742db5fb67c5f7761666ea144438b28658f  bitcoin-0.17.99-win32-setup-unsigned.exe
    95699f643a356c312f7d00f4e9d188512d57bec12af927e0dea9e1ce2a885b23  bitcoin-0.17.99-win32.zip
    293cc8df29af3aaad9e821e59ef31c0aeb820caf5e4195de7c3a4c49bee0982b  bitcoin-0.17.99-win64-debug.zip
    3d3e89c399b0436a9ed642fba5671414182343810506d6acfeabd166e8bf23c2  bitcoin-0.17.99-win64-setup-unsigned.exe
    7c78fc980d9532eea4b67b5964bf7a9dc70d6df06aa685f4d14ae284a0c84d15  bitcoin-0.17.99-win64.zip
    
    5c96065b7e616adce74d8634e6edddb0f73d32998ef4edb6b912dff65d1929a9  bitcoin-0.17.99-osx-unsigned.dmg
    265ee59bff507a33c350c5187b864627a77fd56f649c58cc9257743792a6a22c  bitcoin-0.17.99-osx-unsigned.tar.gz
    af981f9cc289a094946e5be4e3012e16bd104eb68cb48eeec6386d4e7b19c424  bitcoin-0.17.99-osx64.tar.gz
    
    f3112792beb03c4411d887aaa52f3adf0798a302a2f2c69ed4a75c6894cc2104  src/bitcoin-0.17.99.tar.gz
    
  10. laanwj commented at 2:02 PM on August 18, 2018: member

    Thank you for figuring this out! and congrats on PR 14000 utACK de0b4fba2fb5270dcc8d851243af9187b8ef191a

  11. in depends/packages/qt.mk:86 in de0b4fba2f
      82 | @@ -83,7 +83,7 @@ $(package)_config_opts_darwin += -device-option MAC_TARGET=$(host)
      83 |  $(package)_config_opts_darwin += -device-option MAC_LD64_VERSION=$(LD64_VERSION)
      84 |  endif
      85 |  
      86 | -$(package)_config_opts_linux  = -qt-xkbcommon
      87 | +$(package)_config_opts_linux  = -qt-xkbcommon-x11
    


  12. fanquake commented at 4:02 AM on August 19, 2018: member

    utACK de0b4fb

  13. DrahtBot commented at 6:30 PM on August 19, 2018: member

    <!--a722867cd34abeea1fadc8d60700f111-->

    Gitian builds for commit 1f470a8916aabbb7f03afda26d41ebfd8d1a2263 (master):

    Gitian builds for commit 991dd820807450f37e48e474b4e2049d30922cc1 (master and this pull):

  14. DrahtBot removed the label Needs gitian build on Aug 19, 2018
  15. MarcoFalke merged this on Aug 19, 2018
  16. MarcoFalke closed this on Aug 19, 2018

  17. MarcoFalke referenced this in commit df660aa771 on Aug 19, 2018
  18. MarcoFalke referenced this in commit 4884945689 on Aug 19, 2018
  19. MarcoFalke referenced this in commit 48c845902a on Aug 19, 2018
  20. MarcoFalke removed the label Needs backport on Aug 19, 2018
  21. uhliksk referenced this in commit abf12b5fde on Aug 29, 2018
  22. HashUnlimited referenced this in commit a4e04a92ed on Sep 14, 2018
  23. Munkybooty referenced this in commit 2d3a73c37d on Jun 30, 2021
  24. Munkybooty referenced this in commit 61fe44eccb on Jun 30, 2021
  25. Munkybooty referenced this in commit 08188d3b1d on Jul 1, 2021
  26. Munkybooty referenced this in commit e63486d656 on Sep 8, 2021
  27. DrahtBot locked this on Sep 8, 2021

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: 2026-04-18 15:15 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me