HomePhabricator

depends: fix qt determinism

Description

depends: fix qt determinism

Summary:
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.

This is a backport of Core's PR14000

Depends on D1822

Test Plan:

make -C ../depends build-all

Reviewers: #bitcoin_abc, jasonbcox

Reviewed By: #bitcoin_abc, jasonbcox

Subscribers: teamcity

Differential Revision: https://reviews.bitcoinabc.org/D1823

Details

Provenance
Cory Fields <cory-nospam-@coryfields.com>Authored on Aug 17 2018, 22:49
deadalnixCommitted on Sep 27 2018, 17:55
deadalnixPushed on Sep 27 2018, 17:55
Reviewer
Restricted Project
Differential Revision
D1823: depends: fix qt determinism
Parents
rABC21cb1d487e51: Fix Qt's rcc determinism for depends/gitian
Branches
Unknown
Tags
Unknown

Event Timeline

deadalnix committed rABCc508283230e4: depends: fix qt determinism (authored by Cory Fields <cory-nospam-@coryfields.com>).Sep 27 2018, 17:55