sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge bitcoin#21654: Make Qt rcc output always deterministic

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2021-04-11 15:42:00 +03:00
parent b9b9473f55
commit 7b69a4cb42
5 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/gitian-descriptors/gitian-linux.yml
View File

@ -48,7 +48,6 @@ script: |
HOST_CXXFLAGS="-O2 -g" HOST_CXXFLAGS="-O2 -g"
HOST_LDFLAGS_BASE="-static-libstdc++" HOST_LDFLAGS_BASE="-static-libstdc++"
export QT_RCC_SOURCE_DATE_OVERRIDE=1
export TZ="UTC" export TZ="UTC"
export BUILD_DIR="$PWD" export BUILD_DIR="$PWD"
mkdir -p ${WRAP_DIR} mkdir -p ${WRAP_DIR}

1
contrib/gitian-descriptors/gitian-osx.yml
View File

@ -45,7 +45,6 @@ script: |
FAKETIME_HOST_PROGS="" FAKETIME_HOST_PROGS=""
FAKETIME_PROGS="ar ranlib date dmg xorrisofs" FAKETIME_PROGS="ar ranlib date dmg xorrisofs"
export QT_RCC_SOURCE_DATE_OVERRIDE=1
export TZ="UTC" export TZ="UTC"
export BUILD_DIR="$PWD" export BUILD_DIR="$PWD"
mkdir -p ${WRAP_DIR} mkdir -p ${WRAP_DIR}

1
contrib/gitian-descriptors/gitian-win.yml
View File

@ -38,7 +38,6 @@ script: |
HOST_CFLAGS="-O2 -g -fno-ident" HOST_CFLAGS="-O2 -g -fno-ident"
HOST_CXXFLAGS="-O2 -g -fno-ident" HOST_CXXFLAGS="-O2 -g -fno-ident"
export QT_RCC_SOURCE_DATE_OVERRIDE=1
export TZ="UTC" export TZ="UTC"
export BUILD_DIR="$PWD" export BUILD_DIR="$PWD"
mkdir -p ${WRAP_DIR} mkdir -p ${WRAP_DIR}

2
depends/packages/qt.mk
View File

@ -164,8 +164,6 @@ $(package)_config_opts_aarch64_android += -android-arch arm64-v8a
$(package)_config_opts_armv7a_android += -android-arch armeabi-v7a $(package)_config_opts_armv7a_android += -android-arch armeabi-v7a
$(package)_config_opts_x86_64_android += -android-arch x86_64 $(package)_config_opts_x86_64_android += -android-arch x86_64
$(package)_config_opts_i686_android += -android-arch i686 $(package)_config_opts_i686_android += -android-arch i686
$(package)_build_env += QT_RCC_SOURCE_DATE_OVERRIDE=1
endef endef
define $(package)_fetch_cmds define $(package)_fetch_cmds

4
src/Makefile.qt.include
View File

@ -410,12 +410,12 @@ translate: $(srcdir)/qt/dashstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_
$(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM) $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM)
@test -f $(RCC) @test -f $(RCC)
@cp -f $< $(@D)/temp_$(<F) @cp -f $< $(@D)/temp_$(<F)
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name dash_locale $(@D)/temp_$(<F) > $@ $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name dash_locale --format-version 1 $(@D)/temp_$(<F) > $@
@rm $(@D)/temp_$(<F) @rm $(@D)/temp_$(<F)
$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(RES_FONTS) $(RES_MOVIES) $(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(RES_FONTS) $(RES_MOVIES)
@test -f $(RCC) @test -f $(RCC)
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name dash $< > $@ $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name dash --format-version 1 $< > $@
CLEAN_QT = $(nodist_qt_libdashqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/temp_dash_locale.qrc qt/res/css/colors/* CLEAN_QT = $(nodist_qt_libdashqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/temp_dash_locale.qrc qt/res/css/colors/*