From 3399d58e857b3d1d40d9b118168a40d55cc38df5 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 25 Jan 2022 16:42:27 +0100 Subject: [PATCH] modules: compile rtkit module instead of using a symlink The rpath is otherwise not right. Fixes #2065 --- src/modules/meson.build | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/modules/meson.build b/src/modules/meson.build index ebcf38fe5..59d657441 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build @@ -148,17 +148,12 @@ pipewire_module_rt = shared_library('pipewire-module-rt', [ 'module-rt.c' ], ) # TODO: This serves as a temporary alias to prevent breaking existing setups # while `module-rtkit` is being migrated to `module-rt` -fs = import('fs') -custom_target('pipewire-module-rtkit', - # Basing this on the original output path makes sure we get the library - # prefixes and suffixes right - output : [fs.name(pipewire_module_rt.full_path()).replace('module-rt', 'module-rtkit')], - # Using the `input` parameter for this doesn't work on Meson 59, and on newer - # versions it will show a spurious warning - command : ['ln', '-sf', fs.name(pipewire_module_rt.full_path()), '@OUTPUT@'], +pipewire_module_rtkit = shared_library('pipewire-module-rtkit', [ 'module-rt.c' ], + include_directories : [configinc], install : true, install_dir : modules_install_dir, - depends : [pipewire_module_rt], + install_rpath: modules_install_dir, + dependencies : [dbus_dep, mathlib, dl_lib, pipewire_dep], ) endif summary({'rt': build_module_rt}, bool_yn: true, section: 'Optional Modules')