Skip to content

Commit e16f872

Browse files
committed
Merge bitcoin#21655: build, qt: No longer need to set QT_RCC_TEST=1 for determinism
c799a19 build, qt: No longer need to set QT_RCC_TEST=1 for determinism (Hennadii Stepanov) Pull request description: The Qt Resource Compiler (rcc) output order relies on [`QHash`](https://doc.qt.io/qt-5/qhash.html): > This randomization of `QHash` is enabled by default. Even though programs should never depend on a particular `QHash` ordering, there may be situations where you temporarily need deterministic behavior, for example for debugging or regression testing. To disable the randomization, define the environment variable `QT_HASH_SEED` to have the value 0. Since bitcoin#3620 we use `QT_RCC_TEST=1` to achieve a deterministic output. Since Qt 5.3.1 hash seeding is disabled for all of the bootstrapped tools, including rcc. Therefore, `QT_RCC_TEST=1` is no longer needed. See commit [5283a6c87beac5a43f612786fefd6e43f2c70bf6](qt/qtbase@5283a6c). ACKs for top commit: fanquake: ACK c799a19 Tree-SHA512: 9d116ac1e8c605ee3e8ed7f618586f0de85d8b06bbbb70fe8c298939ce203d2a7e97264a9afac037179993ab54c5f69a65ebb9ab27ca7f45acb963011bd45743
2 parents e507acb + c799a19 commit e16f872

File tree

5 files changed

+0
-5
lines changed

5 files changed

+0
-5
lines changed

contrib/gitian-descriptors/gitian-linux.yml

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ script: |
5555
HOST_CXXFLAGS="-O2 -g"
5656
HOST_LDFLAGS_BASE="-static-libstdc++ -Wl,-O2"
5757
58-
export QT_RCC_TEST=1
5958
export QT_RCC_SOURCE_DATE_OVERRIDE=1
6059
export TZ="UTC"
6160
export BUILD_DIR="$PWD"

contrib/gitian-descriptors/gitian-osx.yml

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ script: |
4141
FAKETIME_HOST_PROGS=""
4242
FAKETIME_PROGS="ar ranlib date dmg xorrisofs"
4343
44-
export QT_RCC_TEST=1
4544
export QT_RCC_SOURCE_DATE_OVERRIDE=1
4645
export TZ="UTC"
4746
export BUILD_DIR="$PWD"

contrib/gitian-descriptors/gitian-win.yml

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ script: |
3737
HOST_CFLAGS="-O2 -g -fno-ident"
3838
HOST_CXXFLAGS="-O2 -g -fno-ident"
3939
40-
export QT_RCC_TEST=1
4140
export QT_RCC_SOURCE_DATE_OVERRIDE=1
4241
export TZ="UTC"
4342
export BUILD_DIR="$PWD"

contrib/guix/libexec/build.sh

-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ case "$HOST" in
175175
esac
176176

177177
# Environment variables for determinism
178-
export QT_RCC_TEST=1
179178
export QT_RCC_SOURCE_DATE_OVERRIDE=1
180179
export TAR_OPTIONS="--owner=0 --group=0 --numeric-owner --mtime='@${SOURCE_DATE_EPOCH}' --sort=name"
181180
export TZ="UTC"

depends/packages/qt.mk

-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ $(package)_config_opts_armv7a_android += -android-arch armeabi-v7a
173173
$(package)_config_opts_x86_64_android += -android-arch x86_64
174174
$(package)_config_opts_i686_android += -android-arch i686
175175

176-
$(package)_build_env = QT_RCC_TEST=1
177176
$(package)_build_env += QT_RCC_SOURCE_DATE_OVERRIDE=1
178177
endef
179178

0 commit comments

Comments
 (0)