Skip to content

Commit a3186b6

Browse files
committed
Merge #20520: depends: Do not force Precompiled Headers (PCH) for building Qt on Linux
c82d15b depends: Do not force Precompiled Headers (PCH) for building Qt on Linux (Hennadii Stepanov) Pull request description: On CentOS 8 (Cirrus CI job) the forced `-pch` option breaks Qt build. Removing `-pch` option does not affect build time for other systems: - master (e2ff5e7): ``` $ time make -j 9 -C depends/ qt ... Caching qt... make: Leaving directory '/home/hebasto/guix/GitHub/bitcoin/depends' real 4m22,359s user 18m3,719s sys 1m24,769s ``` - this PR: ``` $ time make -j 9 -C depends/ qt ... Caching qt... make: Leaving directory '/home/hebasto/guix/GitHub/bitcoin/depends' real 4m14,862s user 18m3,355s sys 1m24,506s ``` Qt docs: https://doc.qt.io/qt-5/qmake-precompiledheaders.html Fixes #20423 ACKs for top commit: MarcoFalke: review ACK c82d15b Tree-SHA512: 0f2a3712e90de881d00f8e56c363edde33dd4f5c117df5744ab4e51d0a8146331de7236bc8329d68ddd91535cd853e68ee80ef4cceb6a909786abfd8881b01e8
2 parents 681ce59 + c82d15b commit a3186b6

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

ci/test/00_setup_env_i686_centos.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ export CONTAINER_NAME=ci_i686_centos_8
1111
export DOCKER_NAME_TAG=centos:8
1212
export DOCKER_PACKAGES="gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache libtool make git python3 python3-zmq which patch lbzip2 dash rsync coreutils"
1313
export GOAL="install"
14-
export DEP_OPTS="NO_QT=1" # Gui disabled for now to avoid build failures
15-
export BITCOIN_CONFIG="--enable-zmq --with-gui=no --enable-reduce-exports --with-boost-process"
14+
export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-reduce-exports --with-boost-process"
1615
export CONFIG_SHELL="/bin/dash"
1716
export TEST_RUNNER_ENV="LC_ALL=en_US.UTF-8"

depends/packages/qt.mk

+3-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ $(package)_config_opts += -nomake examples
7070
$(package)_config_opts += -nomake tests
7171
$(package)_config_opts += -opensource
7272
$(package)_config_opts += -optimized-tools
73-
$(package)_config_opts += -pch
7473
$(package)_config_opts += -pkg-config
7574
$(package)_config_opts += -prefix $(host_prefix)
7675
$(package)_config_opts += -qt-libpng
@@ -117,6 +116,7 @@ $(package)_config_opts += -no-feature-xml
117116

118117
$(package)_config_opts_darwin = -no-dbus
119118
$(package)_config_opts_darwin += -no-opengl
119+
$(package)_config_opts_darwin += -pch
120120

121121
ifneq ($(build_os),darwin)
122122
$(package)_config_opts_darwin += -xplatform macx-clang-linux
@@ -149,6 +149,7 @@ $(package)_config_opts_mingw32 = -no-opengl
149149
$(package)_config_opts_mingw32 += -no-dbus
150150
$(package)_config_opts_mingw32 += -xplatform win32-g++
151151
$(package)_config_opts_mingw32 += -device-option CROSS_COMPILE="$(host)-"
152+
$(package)_config_opts_mingw32 += -pch
152153

153154
$(package)_config_opts_android = -xplatform android-clang
154155
$(package)_config_opts_android += -android-sdk $(ANDROID_SDK)
@@ -164,6 +165,7 @@ $(package)_config_opts_android += -qt-freetype
164165
$(package)_config_opts_android += -no-fontconfig
165166
$(package)_config_opts_android += -L $(host_prefix)/lib
166167
$(package)_config_opts_android += -I $(host_prefix)/include
168+
$(package)_config_opts_android += -pch
167169

168170
$(package)_config_opts_aarch64_android += -android-arch arm64-v8a
169171
$(package)_config_opts_armv7a_android += -android-arch armeabi-v7a

0 commit comments

Comments
 (0)