mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix linking with -latomic

Browse source 
Linking with -latomic has been added to pipewire-jack since
b8c58c74d8

However, this is not the right place to add this dependency, atomic_dep
should be added to pipewire_dep to avoid the following build failure:

/home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/9.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: src/pipewire/libpipewire-0.3.so.0.326.0.p/filter.c.o: in function `impl_node_process':
filter.c:(.text+0xf28): undefined reference to `__atomic_fetch_add_4'

Indeed, atomic operation such as __atomic_fetch_add is used in libcamera
as well as in ./spa/plugins/libcamera/libcamera_wrapper.cpp,
./spa/include/spa/utils/ringbuffer.h and ./spa/include/spa/graph/graph.h

Fixes:
 - http://autobuild.buildroot.org/results/b5305e8e7dd1a5e8bfaba72b06251056ba7d1af1

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
This commit is contained in:
Fabrice Fontaine 2021-05-21 07:47:46 +02:00 • committed by Wim Taymans
parent 22d874cdeb
commit fa64d93e64
3 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
meson.build
View file

@ -157,7 +157,7 @@ test_8_byte_atomic = '''
int main(void) int main(void)
{ {
int64_t eight; int64_t eight;
__atomic_store_n(&eight, 123, __ATOMIC_SEQ_CST); __atomic_fetch_add(&eight, 123, __ATOMIC_SEQ_CST);
return 0; return 0;
} }
''' '''
@ -166,16 +166,15 @@ int main(void)
# operations on any reasonable architecture. # operations on any reasonable architecture.
if cc.links( if cc.links(
test_8_byte_atomic, test_8_byte_atomic,
name : '8-byte __atomic_store_n without libatomic') name : '8-byte __atomic_fetch_add without libatomic')
atomic_dep = dependency('', required: false) atomic_dep = dependency('', required: false)
elif cc.links( elif cc.links(
test_8_byte_atomic, test_8_byte_atomic,
dependencies : libatomic, dependencies : libatomic,
name : '8-byte __atomic_store_n with libatomic') name : '8-byte __atomic_fetch_add with libatomic')
atomic_dep = libatomic atomic_dep = libatomic
elif get_option('pipewire-jack').enabled() else
# Currently only required for the JACK backend error('8-byte atomic operations are required')
error('8-byte atomic operations are required for pipewire-jack')
endif endif
cdata = configuration_data() cdata = configuration_data()

4
pipewire-jack/src/meson.build
View file

@ -42,7 +42,7 @@ pipewire_jack = shared_library('jack',
version : libversion, version : libversion,
c_args : pipewire_jack_c_args, c_args : pipewire_jack_c_args,
include_directories : [configinc, jack_inc], include_directories : [configinc, jack_inc],
dependencies : [pipewire_dep, atomic_dep, mathlib], dependencies : [pipewire_dep, mathlib],
install : true, install : true,
install_dir : libjack_path, install_dir : libjack_path,
) )
@ -53,7 +53,7 @@ pipewire_jackserver = shared_library('jackserver',
version : libversion, version : libversion,
c_args : pipewire_jack_c_args, c_args : pipewire_jack_c_args,
include_directories : [configinc, jack_inc], include_directories : [configinc, jack_inc],
dependencies : [pipewire_dep, atomic_dep, mathlib], dependencies : [pipewire_dep, mathlib],
install : true, install : true,
install_dir : libjack_path, install_dir : libjack_path,
) )

4
src/pipewire/meson.build
View file

@ -102,12 +102,12 @@ libpipewire = shared_library(pipewire_name, pipewire_sources,
c_args : libpipewire_c_args, c_args : libpipewire_c_args,
include_directories : [pipewire_inc, configinc, spa_inc], include_directories : [pipewire_inc, configinc, spa_inc],
install : true, install : true,
dependencies : [dl_lib, mathlib, pthread_lib, libintl_dep, ], dependencies : [dl_lib, mathlib, pthread_lib, libintl_dep, atomic_dep, ],
) )
pipewire_dep = declare_dependency(link_with : libpipewire, pipewire_dep = declare_dependency(link_with : libpipewire,
include_directories : [pipewire_inc, configinc, spa_inc], include_directories : [pipewire_inc, configinc, spa_inc],
dependencies : [pthread_lib, ], dependencies : [pthread_lib, atomic_dep, ],
) )
pkgconfig.generate(filebase : 'lib@0@'.format(pipewire_name), pkgconfig.generate(filebase : 'lib@0@'.format(pipewire_name),