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