Skip to content
Snippets Groups Projects
Commit 7d10079f authored by Simon McVittie's avatar Simon McVittie
Browse files

Link pressure-vessel-wrap to libsteam-runtime-tools statically


This avoids needing to mess about with RPATHs to make the link (and
the containers test) work, and in future will allow access to
non-API-stable parts of the library.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent cf8d0204
No related branches found
No related tags found
No related merge requests found
......@@ -386,10 +386,6 @@ def main():
'soname:libjson-glib-1.0.so.0',
'soname:libpcre.so.3',
'soname:libselinux.so.1',
'path:{}/lib/{}/libsteam-runtime-tools-0.so.0'.format(
args.prefix,
arch.multiarch,
),
])
for so in glob.glob(
......
......@@ -201,7 +201,7 @@ executable(
] + enums,
c_args : pv_c_args,
dependencies : [
libsteamrt_dep,
libsteamrt_static_dep,
gio_unix,
xau,
libglnx.get_variable('libglnx_dep'),
......
......@@ -71,8 +71,8 @@ install_headers(
subdir : join_paths('steam-runtime-tools-' + api_major, 'steam-runtime-tools'),
)
libsteamrt = library(
'steam-runtime-tools-' + api_major,
libsteamrt_static = static_library(
'steam-runtime-tools-internal',
libsteamrt_sources + libsteamrt_public_headers + enums,
c_args : [
'-DG_LOG_DOMAIN="' + meson.project_name() + '"',
......@@ -83,6 +83,12 @@ libsteamrt = library(
],
include_directories : project_include_dirs,
dependencies : [libdl, threads, libelf, gio_unix, glib, gobject, json_glib],
install : false,
)
libsteamrt = library(
'steam-runtime-tools-' + api_major,
dependencies : [libdl, threads, libelf, gio_unix, glib, gobject, json_glib],
objects : [libsteamrt_static.extract_all_objects()],
soversion : abi_major,
version : abi_major + '.' + abi_minor,
install : true,
......@@ -100,6 +106,11 @@ libsteamrt_dep = declare_dependency(
link_with : libsteamrt,
sources : libsteamrt_public_headers + [enums[1]],
)
libsteamrt_static_dep = declare_dependency(
include_directories : project_include_dirs,
link_with : libsteamrt_static,
sources : libsteamrt_public_headers + [enums[1]],
)
if get_option('introspection')
gnome.generate_gir(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment