diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-01-31 21:37:43 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-02-03 14:43:51 +0100 |
| commit | 65615a3a784c01128b408a915ab375c35640fb0a (patch) | |
| tree | da865e5cf47c2125f6c8f8f065a5c5a6adb4c232 /contrib/gitian-descriptors/qt-win.yml | |
| parent | 15ec451554b5889a92651b9fe71bf01047ba9fc3 (diff) | |
Gitian fixes for 0.9.0rc1 build
- Add 'g++' package (virtualbox images don't have this by default)
- Workaround for determinism in Qt5 resources
- Pass --disable-maintainer-mode --disable-dependency-tracking to
configure for libqrencode to avoid random errors about missing m4
directory
- Fix typo -with-pic -> --with-pic
It is not necessary to rebuild dependencies after this commit.
Fixes #3610 and #3612.
Diffstat (limited to 'contrib/gitian-descriptors/qt-win.yml')
| -rw-r--r-- | contrib/gitian-descriptors/qt-win.yml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/contrib/gitian-descriptors/qt-win.yml b/contrib/gitian-descriptors/qt-win.yml index 3b9aeeb19f..fed39cbc7c 100644 --- a/contrib/gitian-descriptors/qt-win.yml +++ b/contrib/gitian-descriptors/qt-win.yml @@ -21,6 +21,14 @@ script: | # Defines export TZ=UTC INDIR=$HOME/build + # Qt: workaround for determinism in resource ordering + # Qt5's rcc uses a QHash to store the files for the resource. + # A security fix in QHash makes the ordering of keys to be different on every run + # (https://qt.gitorious.org/qt/qtbase/commit/c01eaa438200edc9a3bbcd8ae1e8ded058bea268). + # This is good in general but qrc shouldn't be doing a traversal over a randomized container. + # The thorough solution would be to use QMap instead of QHash, but this requires patching Qt. + # For now luckily there is a test mode that forces a fixed seed. + export QT_RCC_TEST=1 # Integrity Check echo "395ec72277c5786c65b8163ef5817fd03d0a1f524a6d47f53624baf8056f1081 qt-everywhere-opensource-src-5.2.0.tar.gz" | sha256sum -c @@ -71,7 +79,7 @@ script: | # as zip stores file timestamps, use faketime to intercept stat calls to set dates for all files to reference date export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - zip -r $OUTDIR/qt-win${BITS}-5.2.0-gitian-r1.zip * + zip -r $OUTDIR/qt-win${BITS}-5.2.0-gitian-r2.zip * unset LD_PRELOAD unset FAKETIME done # for BITS in |