Skip to content

Commit

Permalink
Merge bitcoin#22174: build, qt: Fix libraries linking order for Linux…
Browse files Browse the repository at this point in the history 
… hosts

a8bd5ea 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 bitcoin#22105.

ACKs for top commit:
  prayank23:
    ACK bitcoin@a8bd5ea
  fanquake:
    ACK a8bd5ea

Tree-SHA512: 6ea2a1ba5440dd01e64428e5c3aa3e7a6e1380b723071ad38a0516b23b56dc252cb2a6544e014b13a0b2f89b3fe45c04a82e498669b5cc74a5f9b70d9c270926
  • Loading branch information
@fanquake @PastaPastaPasta
fanquake authored and PastaPastaPasta committed Apr 28, 2022
1 parent 27fead1 commit 928cf49
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build-aux/m4/bitcoin_qt.m4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,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
Expand Down

0 comments on commit 928cf49

Please sign in to comment.