Skip to content

Commit 6fdf5da

Browse files
committed
depends: only use dbus with qt on linux
1 parent 76e777d commit 6fdf5da

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

depends/packages/qt.mk

+10-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ $(package)_config_opts_debug = -debug
2525
$(package)_config_opts += -bindir $(build_prefix)/bin
2626
$(package)_config_opts += -c++std c++11
2727
$(package)_config_opts += -confirm-license
28-
$(package)_config_opts += -dbus-runtime
2928
$(package)_config_opts += -hostprefix $(build_prefix)
3029
$(package)_config_opts += -no-compile-examples
3130
$(package)_config_opts += -no-cups
@@ -105,8 +104,10 @@ $(package)_config_opts += -no-feature-vnc
105104
$(package)_config_opts += -no-feature-wizard
106105
$(package)_config_opts += -no-feature-xml
107106

107+
$(package)_config_opts_darwin = -no-dbus
108+
108109
ifneq ($(build_os),darwin)
109-
$(package)_config_opts_darwin = -xplatform macx-clang-linux
110+
$(package)_config_opts_darwin += -xplatform macx-clang-linux
110111
$(package)_config_opts_darwin += -device-option MAC_SDK_PATH=$(OSX_SDK)
111112
$(package)_config_opts_darwin += -device-option MAC_SDK_VERSION=$(OSX_SDK_VERSION)
112113
$(package)_config_opts_darwin += -device-option CROSS_COMPILE="$(host)-"
@@ -122,12 +123,17 @@ $(package)_config_opts_linux += -no-feature-xlib
122123
$(package)_config_opts_linux += -system-freetype
123124
$(package)_config_opts_linux += -fontconfig
124125
$(package)_config_opts_linux += -no-opengl
126+
$(package)_config_opts_linux += -dbus-runtime
125127
$(package)_config_opts_arm_linux += -platform linux-g++ -xplatform bitcoin-linux-g++
126128
$(package)_config_opts_i686_linux = -xplatform linux-g++-32
127129
$(package)_config_opts_x86_64_linux = -xplatform linux-g++-64
128130
$(package)_config_opts_aarch64_linux = -xplatform linux-aarch64-gnu-g++
129131
$(package)_config_opts_riscv64_linux = -platform linux-g++ -xplatform bitcoin-linux-g++
130-
$(package)_config_opts_mingw32 = -no-opengl -xplatform win32-g++ -device-option CROSS_COMPILE="$(host)-"
132+
133+
$(package)_config_opts_mingw32 = -no-opengl
134+
$(package)_config_opts_mingw32 += -no-dbus
135+
$(package)_config_opts_mingw32 += -xplatform win32-g++
136+
$(package)_config_opts_mingw32 += -device-option CROSS_COMPILE="$(host)-"
131137

132138
$(package)_config_opts_android = -xplatform android-clang
133139
$(package)_config_opts_android += -android-sdk $(ANDROID_SDK)
@@ -137,6 +143,7 @@ $(package)_config_opts_android += -device-option CROSS_COMPILE="$(host)-"
137143
$(package)_config_opts_android += -egl
138144
$(package)_config_opts_android += -qpa xcb
139145
$(package)_config_opts_android += -no-eglfs
146+
$(package)_config_opts_android += -no-dbus
140147
$(package)_config_opts_android += -opengl es2
141148
$(package)_config_opts_android += -qt-freetype
142149
$(package)_config_opts_android += -no-fontconfig

0 commit comments

Comments
 (0)