Skip to content

Commit 9a01ab0

Browse files
committed
depends: qt: Explicitly stop using Xlib/libX11
Previously, in 683b7d7 and 0e75263, we accidentally broke QT's ability to pick up Xlib thru the config.gui.tests.xlib configuration test, which also means that config.gui.libraries.xcb_xlib wasn't run. This resulted in a QT build that was implicitly -no-xcb-lib and -no-feature-xlib. This is actually a desired behaviour, as it means less required shared objects for our final bitcoin-qt binary. Specifically, it eliminated the libX11-xcb.so.1 and libX11.so.6 requirements. In this commit, we explicitly build without Xlib. We should continue to track upstream ticket https://bugreports.qt.io/browse/QTBUG-61452 which talks about adding a -no-xlib (non-hidden) flag instead of the -no-feature-xlib (hidden) flag.
1 parent 1ec30b8 commit 9a01ab0

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

depends/packages/qt.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ endif
9898

9999
$(package)_config_opts_linux = -qt-xkbcommon-x11
100100
$(package)_config_opts_linux += -qt-xcb
101+
$(package)_config_opts_linux += -no-xcb-xlib
102+
$(package)_config_opts_linux += -no-feature-xlib
101103
$(package)_config_opts_linux += -system-freetype
102104
$(package)_config_opts_linux += -no-feature-sessionmanager
103105
$(package)_config_opts_linux += -fontconfig

0 commit comments

Comments
 (0)