diff options
author | MarcoFalke <falke.marco@gmail.com> | 2018-08-19 14:34:00 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2018-08-19 14:34:13 -0400 |
commit | df660aa7717a6f4784e90535a13a95d82244565a (patch) | |
tree | 62cac953840bbf313f8391a0186808a82bd845f1 /src/qt/optionsdialog.h | |
parent | 1f470a8916aabbb7f03afda26d41ebfd8d1a2263 (diff) | |
parent | de0b4fba2fb5270dcc8d851243af9187b8ef191a (diff) | |
download | bitcoin-df660aa7717a6f4784e90535a13a95d82244565a.tar.xz |
Merge #14000: depends: fix qt determinism
de0b4fba2f depends: fix qt determinism (Cory Fields)
Pull request description:
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.
Tree-SHA512: 1d51f9aa050bf38e1f13f4a88f623628e026503891a8a063040dc5e938ba8d60e5fb8c7c2927d15c36f4773bbbb52950b0879fd4a43f3c7c08833f45939989ad
Diffstat (limited to 'src/qt/optionsdialog.h')
0 files changed, 0 insertions, 0 deletions