1*4882a593SmuzhiyunFrom d2bd33ec18c146b27fb5aff7dd0089faa195ef9b Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Mon, 11 Feb 2019 21:42:01 +0100 4*4882a593SmuzhiyunSubject: [PATCH] meson.build: add atomic dependency for sparc 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunLinking with libatomic is needed on sparc otherwise build fails on: 7*4882a593Smuzhiyunncmpc@exe/src_Main.cxx.o: In function `std::__atomic_base<long>::operator++()': 8*4882a593Smuzhiyun/home/buildroot/autobuild/instance-1/output/host/opt/ext-toolchain/sparc-buildroot-linux-uclibc/include/c++/6.4.0/bits/atomic_base.h:296: undefined reference to `__atomic_fetch_add_4' 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunFixes: 11*4882a593Smuzhiyun - http://autobuild.buildroot.org/results/7ac1a07e4f72633d3ec92b79dc5d8c062490abdc 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 14*4882a593Smuzhiyun[Upstream status: https://github.com/MusicPlayerDaemon/ncmpc/pull/45] 15*4882a593Smuzhiyun--- 16*4882a593Smuzhiyun meson.build | 4 ++++ 17*4882a593Smuzhiyun 1 file changed, 4 insertions(+) 18*4882a593Smuzhiyun 19*4882a593Smuzhiyundiff --git a/meson.build b/meson.build 20*4882a593Smuzhiyunindex 2e6defc..b393e39 100644 21*4882a593Smuzhiyun--- a/meson.build 22*4882a593Smuzhiyun+++ b/meson.build 23*4882a593Smuzhiyun@@ -174,6 +174,9 @@ else 24*4882a593Smuzhiyun pcre_dep = declare_dependency() 25*4882a593Smuzhiyun endif 26*4882a593Smuzhiyun 27*4882a593Smuzhiyun+# Needed on sparc 28*4882a593Smuzhiyun+atomic_dep = cc.find_library('atomic', required: false) 29*4882a593Smuzhiyun+ 30*4882a593Smuzhiyun inc = include_directories( 31*4882a593Smuzhiyun 'src', 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun@@ -352,6 +355,7 @@ ncmpc = executable('ncmpc', 34*4882a593Smuzhiyun sources, 35*4882a593Smuzhiyun include_directories: inc, 36*4882a593Smuzhiyun dependencies: [ 37*4882a593Smuzhiyun+ atomic_dep, 38*4882a593Smuzhiyun thread_dep, 39*4882a593Smuzhiyun boost_dep, 40*4882a593Smuzhiyun pcre_dep, 41*4882a593Smuzhiyun-- 42*4882a593Smuzhiyun2.14.1 43*4882a593Smuzhiyun 44