diff options
Diffstat (limited to 'meta/recipes-kernel/libtraceevent/libtraceevent')
-rw-r--r-- | meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch | 47 |
1 files changed, 9 insertions, 38 deletions
diff --git a/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch b/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch index 38b6107136..0c21b2347a 100644 --- a/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch +++ b/meta/recipes-kernel/libtraceevent/libtraceevent/meson.patch | |||
@@ -1,14 +1,20 @@ | |||
1 | Fixes for the Meson build of libtraceevent: | 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: | ||
2 | 5 | ||
3 | - Make the plugin directory the same as the Makefiles | 6 | - Make the plugin directory the same as the Makefiles |
4 | - Install the plugins as modules not static and versioned shared libraries | 7 | - Install the plugins as modules not static and versioned shared libraries |
5 | - Add an option to disable building the documentation (needs asciidoc and xmlto) | ||
6 | 8 | ||
7 | Upstream-Status: Pending | 9 | Upstream-Status: Pending |
8 | Signed-off-by: Ross Burton <ross.burton@arm.com> | 10 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
11 | --- | ||
12 | meson.build | 2 +- | ||
13 | plugins/meson.build | 3 +-- | ||
14 | 2 files changed, 2 insertions(+), 3 deletions(-) | ||
9 | 15 | ||
10 | diff --git a/meson.build b/meson.build | 16 | diff --git a/meson.build b/meson.build |
11 | index b61c873..4bba4d8 100644 | 17 | index 40ce38c..1eb7912 100644 |
12 | --- a/meson.build | 18 | --- a/meson.build |
13 | +++ b/meson.build | 19 | +++ b/meson.build |
14 | @@ -25,7 +25,7 @@ htmldir = join_paths(prefixdir, get_option('htmldir')) | 20 | @@ -25,7 +25,7 @@ htmldir = join_paths(prefixdir, get_option('htmldir')) |
@@ -20,41 +26,6 @@ index b61c873..4bba4d8 100644 | |||
20 | endif | 26 | endif |
21 | 27 | ||
22 | add_project_arguments( | 28 | add_project_arguments( |
23 | @@ -45,10 +45,13 @@ if cunit_dep.found() | ||
24 | subdir('utest') | ||
25 | endif | ||
26 | subdir('samples') | ||
27 | -subdir('Documentation') | ||
28 | |||
29 | -custom_target( | ||
30 | - 'docs', | ||
31 | - output: 'docs', | ||
32 | - depends: [html, man], | ||
33 | - command: ['echo']) | ||
34 | +if get_option('docs') | ||
35 | + subdir('Documentation') | ||
36 | + | ||
37 | + custom_target( | ||
38 | + 'docs', | ||
39 | + output: 'docs', | ||
40 | + depends: [html, man], | ||
41 | + command: ['echo']) | ||
42 | +endif | ||
43 | diff --git a/meson_options.txt b/meson_options.txt | ||
44 | index b2294f6..0611216 100644 | ||
45 | --- a/meson_options.txt | ||
46 | +++ b/meson_options.txt | ||
47 | @@ -4,6 +4,10 @@ | ||
48 | |||
49 | option('plugindir', type : 'string', | ||
50 | description : 'set the plugin dir') | ||
51 | + | ||
52 | +option('docs', type : 'boolean', value: true, | ||
53 | + description : 'build documentation') | ||
54 | + | ||
55 | option('htmldir', type : 'string', value : 'share/doc/libtraceevent-doc', | ||
56 | description : 'directory for HTML documentation') | ||
57 | option('asciidoctor', type : 'boolean', value: false, | ||
58 | diff --git a/plugins/meson.build b/plugins/meson.build | 29 | diff --git a/plugins/meson.build b/plugins/meson.build |
59 | index 74ad664..4919be4 100644 | 30 | index 74ad664..4919be4 100644 |
60 | --- a/plugins/meson.build | 31 | --- a/plugins/meson.build |