mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-14 06:59:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-sys: meson: Correctly set up RPATH

Browse source 
This was being done automatically by autotools, now we need to manually
specify this for each executable/library with a dependency in a
non-standard directory.
This commit is contained in:
Arun Raghavan 2019-08-03 02:41:55 +05:30
parent f996ad0688
commit 7f44a623e0
12 changed files with 35 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/pulsecore/meson.build
View file

@ -191,6 +191,7 @@ libpulsecore = shared_library('pulsecore-' + pa_version_major_minor,
c_args : [pa_c_args, server_c_args],
link_args : [nodelete_link_args],
install : true,
install_rpath : privlibdir,
install_dir : privlibdir,
link_with : libpulsecore_simd_lib,
dependencies : [libm_dep, libpulsecommon_dep, libpulse_dep, ltdl_dep, shm_dep, sndfile_dep, database_dep, dbus_dep, orc_dep, samplerate_dep, soxr_dep, speex_dep, x11_dep],
@ -210,6 +211,7 @@ libavahi_wrap = shared_library('avahi-wrap',
dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, avahi_dep],
implicit_include_directories : false, # pulsecore/poll.h <vs> /usr/include/poll.h
install : true,
install_rpath : privlibdir,
install_dir : modlibexecdir,
)
@ -221,11 +223,15 @@ libcli = shared_library('cli',
include_directories : [configinc, topinc],
dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep],
install : true,
install_rpath : privlibdir,
install_dir : modlibexecdir,
)
libcli_dep = declare_dependency(link_with: libcli)
# FIXME: meson doesn't support multiple RPATH arguments currently
rpath_dirs = join_paths(privlibdir) + ':' + join_paths(modlibexecdir)
libprotocol_cli = shared_library('protocol-cli',
'protocol-cli.c',
'protocol-cli.h',
@ -234,6 +240,7 @@ libprotocol_cli = shared_library('protocol-cli',
include_directories : [configinc, topinc],
dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libcli_dep],
install : true,
install_rpath : rpath_dirs,
install_dir : modlibexecdir,
)
@ -245,6 +252,7 @@ libprotocol_http = shared_library('protocol-http',
include_directories : [configinc, topinc],
dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep],
install : true,
install_rpath : privlibdir,
install_dir : modlibexecdir,
)
@ -256,6 +264,7 @@ libprotocol_native = shared_library('protocol-native',
include_directories : [configinc, topinc],
dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, dbus_dep],
install : true,
install_rpath : privlibdir,
install_dir : modlibexecdir,
)
@ -267,5 +276,6 @@ libprotocol_simple = shared_library('protocol-simple',
include_directories : [configinc, topinc],
dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep],
install : true,
install_rpath : privlibdir,
install_dir : modlibexecdir,
)