From: Yann E. MORIN Date: Wed, 17 May 2017 21:15:29 +0000 (+0200) Subject: package/qt5base: link with -latomic when needed X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7d286be4f9;p=buildroot.git package/qt5base: link with -latomic when needed Qt 5.8 needs atomic operations, which are provided in libatomic when it exists, like on sparc with gcc >= 4.8. Fixes: http://autobuild.buildroot.org/results/49b/49bc9345b9849c9c3c53ace290c534ff7bb98683/ http://autobuild.buildroot.org/results/9f2/9f213406954be51dfcad76ebdce8b73850842180/ Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Julien Corjon Cc: Peter Seiderer Tested-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 81774b74a6..5fe8bb884b 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -215,6 +215,13 @@ endef endif QT5BASE_ARCH_CONFIG_FILE = $(@D)/mkspecs/devices/linux-buildroot-g++/arch.conf +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC)$(BR2_PACKAGE_QT5_VERSION_LATEST),yy) +# Qt 5.8 needs atomics, which on various architectures are in -latomic +define QT5BASE_CONFIGURE_ARCH_CONFIG + printf 'LIBS += -latomic\n' >$(QT5BASE_ARCH_CONFIG_FILE) +endef +endif + define QT5BASE_CONFIGURE_CMDS $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qmake.conf \ $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf