linux-trace-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alexander Kanavin <alex@linutronix.de>
To: linux-trace-devel@vger.kernel.org, rostedt@goodmis.org
Cc: Alexander Kanavin <alex@linutronix.de>,
	Ross Burton <ross.burton@arm.com>
Subject: [PATCH] build: various fixes for the Meson build of libtraceevent
Date: Mon, 11 Mar 2024 12:11:40 +0100	[thread overview]
Message-ID: <20240311111140.1789879-1-alex@linutronix.de> (raw)

- Make the plugin directory the same as the Makefiles
- Install the plugins as modules not static and versioned shared libraries

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 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,
-- 
2.39.2


                 reply	other threads:[~2024-03-11 11:11 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240311111140.1789879-1-alex@linutronix.de \
    --to=alex@linutronix.de \
    --cc=linux-trace-devel@vger.kernel.org \
    --cc=ross.burton@arm.com \
    --cc=rostedt@goodmis.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).