Patrick Williams | 44b3caf | 2024-04-12 16:51:14 -0500 | [diff] [blame^] | 1 | From 7f88c9ba5f27276e844252500a9f0ba2b350b919 Mon Sep 17 00:00:00 2001 |
| 2 | From: Ross Burton <ross.burton@arm.com> |
| 3 | Date: Sun, 27 Aug 2023 20:57:44 +0100 |
| 4 | Subject: [PATCH] Fixes for the Meson build of libtraceevent: |
Andrew Geissler | 5082cc7 | 2023-09-11 08:41:39 -0400 | [diff] [blame] | 5 | |
| 6 | - Make the plugin directory the same as the Makefiles |
| 7 | - Install the plugins as modules not static and versioned shared libraries |
Andrew Geissler | 5082cc7 | 2023-09-11 08:41:39 -0400 | [diff] [blame] | 8 | |
| 9 | Upstream-Status: Pending |
| 10 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
Patrick Williams | 44b3caf | 2024-04-12 16:51:14 -0500 | [diff] [blame^] | 11 | --- |
| 12 | meson.build | 2 +- |
| 13 | plugins/meson.build | 3 +-- |
| 14 | 2 files changed, 2 insertions(+), 3 deletions(-) |
Andrew Geissler | 5082cc7 | 2023-09-11 08:41:39 -0400 | [diff] [blame] | 15 | |
| 16 | diff --git a/meson.build b/meson.build |
Patrick Williams | 44b3caf | 2024-04-12 16:51:14 -0500 | [diff] [blame^] | 17 | index 40ce38c..1eb7912 100644 |
Andrew Geissler | 5082cc7 | 2023-09-11 08:41:39 -0400 | [diff] [blame] | 18 | --- a/meson.build |
| 19 | +++ b/meson.build |
| 20 | @@ -25,7 +25,7 @@ htmldir = join_paths(prefixdir, get_option('htmldir')) |
| 21 | libdir = join_paths(prefixdir, get_option('libdir')) |
| 22 | plugindir = get_option('plugindir') |
| 23 | if plugindir == '' |
| 24 | - plugindir = join_paths(libdir, 'libtraceevent/plugins') |
| 25 | + plugindir = join_paths(libdir, 'traceevent/plugins') |
| 26 | endif |
| 27 | |
| 28 | add_project_arguments( |
Andrew Geissler | 5082cc7 | 2023-09-11 08:41:39 -0400 | [diff] [blame] | 29 | diff --git a/plugins/meson.build b/plugins/meson.build |
| 30 | index 74ad664..4919be4 100644 |
| 31 | --- a/plugins/meson.build |
| 32 | +++ b/plugins/meson.build |
| 33 | @@ -19,11 +19,10 @@ plugins = [ |
| 34 | |
| 35 | pdeps = [] |
| 36 | foreach plugin : plugins |
| 37 | - pdeps += library( |
| 38 | + pdeps += shared_module( |
| 39 | plugin.replace('.c', ''), |
| 40 | plugin, |
| 41 | name_prefix: '', |
| 42 | - version: library_version, |
| 43 | dependencies: [libtraceevent_dep], |
| 44 | include_directories: [incdir], |
| 45 | install: true, |