summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2017-05-17 23:15:29 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-06-08 23:20:30 +0200
commit7d286be4f96cfb731e184c3e8cfea27a031bde3c (patch)
treee7945185021e531b55638c9a446b4e19df3f6eee
parenta3fd13804fc801fc948d27f9fe932fce7201655a (diff)
downloadbuildroot-7d286be4f96cfb731e184c3e8cfea27a031bde3c.tar.gz
buildroot-7d286be4f96cfb731e184c3e8cfea27a031bde3c.zip
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" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Julien Corjon <corjon.j@ecagroup.com> Cc: Peter Seiderer <ps.report@gmx.net> Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/qt5/qt5base/qt5base.mk7
1 files changed, 7 insertions, 0 deletions
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
OpenPOWER on IntegriCloud