[0.17] depends: fix qt determinism #14005

pull MarcoFalke wants to merge 1 commits into bitcoin:0.17 from MarcoFalke:Mf1808-16qtDependsDet changing 2 files +29 −2

MarcoFalke commented at 6:40 PM on August 19, 2018: member

Backport for rc2
MarcoFalke added the label Backport on Aug 19, 2018
MarcoFalke added this to the milestone 0.17.0 on Aug 19, 2018

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.

Github-Pull: #14000
Rebased-From: de0b4fba2fb5270dcc8d851243af9187b8ef191a

48c845902a

MarcoFalke force-pushed on Aug 19, 2018
MarcoFalke changed the base branch on Aug 19, 2018
MarcoFalke renamed this:
~~[0.16] depends: fix qt determinism~~
[0.17] depends: fix qt determinism
on Aug 19, 2018
MarcoFalke closed this on Aug 19, 2018
MarcoFalke reopened this on Aug 19, 2018
fanquake commented at 11:26 PM on August 19, 2018: member

How do you see why appveyor is failing here, and how do you restart a build?
MarcoFalke commented at 4:50 PM on August 20, 2018: member

@fanquake I am not aware of a way to restart the build, but the appveyor is only meant for master anyway. Also, it doesn't build from depends.
theuni commented at 5:25 PM on August 20, 2018: member

utACK 48c845902ac044af99ceb7cacc1ea3eacfaeb913.
MarcoFalke assigned laanwj on Aug 20, 2018
fanquake commented at 10:39 PM on August 20, 2018: member

utACK 48c8459
ken2812221 commented at 12:11 AM on August 21, 2018: contributor

Tested ACK 48c8459
laanwj merged this on Aug 21, 2018
laanwj closed this on Aug 21, 2018
laanwj referenced this in commit 1ffd67f11f on Aug 21, 2018
UdjinM6 referenced this in commit 3242f08e33 on Dec 17, 2020
gades referenced this in commit 7a64b0a0cd on Jun 24, 2021
CryptoCentric referenced this in commit f172970f2b on Jul 2, 2021
DrahtBot locked this on Sep 8, 2021

Contributors

Labels

Milestone
0.17.0