blob: 0c21b2347a1618e2edcc4de2c6128f857a22b0ae [file] [log] [blame]
Patrick Williams44b3caf2024-04-12 16:51:14 -05001From 7f88c9ba5f27276e844252500a9f0ba2b350b919 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@arm.com>
3Date: Sun, 27 Aug 2023 20:57:44 +0100
4Subject: [PATCH] Fixes for the Meson build of libtraceevent:
Andrew Geissler5082cc72023-09-11 08:41:39 -04005
6- Make the plugin directory the same as the Makefiles
7- Install the plugins as modules not static and versioned shared libraries
Andrew Geissler5082cc72023-09-11 08:41:39 -04008
9Upstream-Status: Pending
10Signed-off-by: Ross Burton <ross.burton@arm.com>
Patrick Williams44b3caf2024-04-12 16:51:14 -050011---
12 meson.build | 2 +-
13 plugins/meson.build | 3 +--
14 2 files changed, 2 insertions(+), 3 deletions(-)
Andrew Geissler5082cc72023-09-11 08:41:39 -040015
16diff --git a/meson.build b/meson.build
Patrick Williams44b3caf2024-04-12 16:51:14 -050017index 40ce38c..1eb7912 100644
Andrew Geissler5082cc72023-09-11 08:41:39 -040018--- 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 Geissler5082cc72023-09-11 08:41:39 -040029diff --git a/plugins/meson.build b/plugins/meson.build
30index 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,