diff options
| author | fanquake <fanquake@gmail.com> | 2021-06-09 15:35:18 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-06-09 15:35:43 +0800 |
| commit | fe511454e131749dabd6e51f2c2a68310e32a871 (patch) | |
| tree | a3e42e09f72c6989ba8803a2edf9c6c4a17b460c | |
| parent | 68a89d7a46bf61c2156da3ad68d20095397b943b (diff) | |
| parent | a8bd5ea01720e5639cabdc9897cf9cf7c02c47c6 (diff) | |
Merge bitcoin/bitcoin#22174: build, qt: Fix libraries linking order for Linux hosts
a8bd5ea01720e5639cabdc9897cf9cf7c02c47c6 build, qt: Fix libraries linking order for Linux hosts (Hennadii Stepanov)
Pull request description:
`-lxcb-shm` should follow `-lxcb` when linking libraries for Linux hosts.
Fixes #22105.
ACKs for top commit:
prayank23:
ACK https://github.com/bitcoin/bitcoin/pull/22174/commits/a8bd5ea01720e5639cabdc9897cf9cf7c02c47c6
fanquake:
ACK a8bd5ea01720e5639cabdc9897cf9cf7c02c47c6
Tree-SHA512: 6ea2a1ba5440dd01e64428e5c3aa3e7a6e1380b723071ad38a0516b23b56dc252cb2a6544e014b13a0b2f89b3fe45c04a82e498669b5cc74a5f9b70d9c270926
| -rw-r--r-- | build-aux/m4/bitcoin_qt.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4 index 232a79bb36..5b5a8ed16e 100644 --- a/build-aux/m4/bitcoin_qt.m4 +++ b/build-aux/m4/bitcoin_qt.m4 @@ -150,7 +150,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ AC_DEFINE(QT_QPA_PLATFORM_WINDOWS, 1, [Define this symbol if the qt platform is windows]) elif test "x$TARGET_OS" = xlinux; then dnl workaround for https://bugreports.qt.io/browse/QTBUG-74874 - AX_CHECK_LINK_FLAG([-lxcb-shm], [QT_LIBS="-lxcb-shm $QT_LIBS"], [AC_MSG_ERROR([could not link against -lxcb-shm])]) + AX_CHECK_LINK_FLAG([-lxcb-shm], [QT_LIBS="$QT_LIBS -lxcb-shm"], [AC_MSG_ERROR([could not link against -lxcb-shm])]) _BITCOIN_QT_CHECK_STATIC_PLUGIN([QXcbIntegrationPlugin], [-lqxcb]) AC_DEFINE(QT_QPA_PLATFORM_XCB, 1, [Define this symbol if the qt platform is xcb]) elif test "x$TARGET_OS" = xdarwin; then |