44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
|
From d2bd33ec18c146b27fb5aff7dd0089faa195ef9b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||
|
|
Date: Mon, 11 Feb 2019 21:42:01 +0100
|
||
|
|
Subject: [PATCH] meson.build: add atomic dependency for sparc
|
||
|
|
|
||
|
|
Linking with libatomic is needed on sparc otherwise build fails on:
|
||
|
|
ncmpc@exe/src_Main.cxx.o: In function `std::__atomic_base<long>::operator++()':
|
||
|
|
/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'
|
||
|
|
|
||
|
|
Fixes:
|
||
|
|
- http://autobuild.buildroot.org/results/7ac1a07e4f72633d3ec92b79dc5d8c062490abdc
|
||
|
|
|
||
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||
|
|
[Upstream status: https://github.com/MusicPlayerDaemon/ncmpc/pull/45]
|
||
|
|
---
|
||
|
|
meson.build | 4 ++++
|
||
|
|
1 file changed, 4 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/meson.build b/meson.build
|
||
|
|
index 2e6defc..b393e39 100644
|
||
|
|
--- a/meson.build
|
||
|
|
+++ b/meson.build
|
||
|
|
@@ -174,6 +174,9 @@ else
|
||
|
|
pcre_dep = declare_dependency()
|
||
|
|
endif
|
||
|
|
|
||
|
|
+# Needed on sparc
|
||
|
|
+atomic_dep = cc.find_library('atomic', required: false)
|
||
|
|
+
|
||
|
|
inc = include_directories(
|
||
|
|
'src',
|
||
|
|
|
||
|
|
@@ -352,6 +355,7 @@ ncmpc = executable('ncmpc',
|
||
|
|
sources,
|
||
|
|
include_directories: inc,
|
||
|
|
dependencies: [
|
||
|
|
+ atomic_dep,
|
||
|
|
thread_dep,
|
||
|
|
boost_dep,
|
||
|
|
pcre_dep,
|
||
|
|
--
|
||
|
|
2.14.1
|
||
|
|
|