mirror of
https://git.yoctoproject.org/poky
synced 2026-02-27 03:49:41 +01:00
a39410ff48
[RP: Add url to submission] (From OE-Core rev: fdb1a67fa3891f40f038c393e907b4e30161b4b5) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit d00306620aa890a361f42516a064d64dd7c68aa7) Signed-off-by: Steve Sakoman <steve@sakoman.com>
75 lines
2.2 KiB
Diff
75 lines
2.2 KiB
Diff
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
|
|
- Add an option to disable building the documentation (needs asciidoc and xmlto)
|
|
|
|
Upstream-Status: Submitted [https://lore.kernel.org/linux-trace-devel/20240311111140.1789879-1-alex@linutronix.de/T/#u]
|
|
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index b61c873..4bba4d8 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(
|
|
@@ -45,10 +45,13 @@ if cunit_dep.found()
|
|
subdir('utest')
|
|
endif
|
|
subdir('samples')
|
|
-subdir('Documentation')
|
|
|
|
-custom_target(
|
|
- 'docs',
|
|
- output: 'docs',
|
|
- depends: [html, man],
|
|
- command: ['echo'])
|
|
+if get_option('docs')
|
|
+ subdir('Documentation')
|
|
+
|
|
+ custom_target(
|
|
+ 'docs',
|
|
+ output: 'docs',
|
|
+ depends: [html, man],
|
|
+ command: ['echo'])
|
|
+endif
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
|
index b2294f6..0611216 100644
|
|
--- a/meson_options.txt
|
|
+++ b/meson_options.txt
|
|
@@ -4,6 +4,10 @@
|
|
|
|
option('plugindir', type : 'string',
|
|
description : 'set the plugin dir')
|
|
+
|
|
+option('docs', type : 'boolean', value: true,
|
|
+ description : 'build documentation')
|
|
+
|
|
option('htmldir', type : 'string', value : 'share/doc/libtraceevent-doc',
|
|
description : 'directory for HTML documentation')
|
|
option('asciidoctor', type : 'boolean', value: false,
|
|
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,
|