From: Daniel Wagner <dwagner@suse.de>
To: linux-trace-devel@vger.kernel.org
Cc: Steven Rostedt <rostedt@goodmis.org>, Tony Jones <tonyj@suse.com>,
Daniel Wagner <dwagner@suse.de>
Subject: [PATCH 1/2] libtracecmd: Add explicit pthread and dl dependency to meson
Date: Thu, 15 Jun 2023 19:44:59 +0200 [thread overview]
Message-ID: <20230615174500.9158-1-dwagner@suse.de> (raw)
Older version of meson do not add automatically the pthread and dl
dependency. Thus add it explicitly to thebuild.
Signed-off-by: Daniel Wagner <dwagner@suse.de>
---
lib/meson.build | 3 +++
lib/trace-cmd/meson.build | 4 ++++
2 files changed, 7 insertions(+)
diff --git a/lib/meson.build b/lib/meson.build
index 52f892fd82d5..389281d3806a 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -29,6 +29,9 @@ conf = configuration_data()
libtraceevent_dep = dependency('libtraceevent', version: '>= 1.5.0', required: true)
libtracefs_dep = dependency('libtracefs', version: '>= 1.6.0', required: true)
+threads_dep = dependency('threads', required: true)
+dl_dep = cc.find_library('dl', required : false)
+
zlib_dep = dependency('zlib', required: false)
conf.set('HAVE_ZLIB', zlib_dep.found(), description: 'Is zlib avialable?')
diff --git a/lib/trace-cmd/meson.build b/lib/trace-cmd/meson.build
index 8c00ca8f8ff7..2193e5265b22 100644
--- a/lib/trace-cmd/meson.build
+++ b/lib/trace-cmd/meson.build
@@ -45,6 +45,8 @@ if libtracecmd_standalone_build
dependencies: [
libtraceevent_dep,
libtracefs_dep,
+ threads_dep,
+ dl_dep,
zlib_dep,
libzstd_dep,
audit_dep],
@@ -77,6 +79,8 @@ else
dependencies: [
libtraceevent_dep,
libtracefs_dep,
+ threads_dep,
+ dl_dep,
zlib_dep,
libzstd_dep,
audit_dep],
--
2.40.1
next reply other threads:[~2023-06-15 17:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-15 17:44 Daniel Wagner [this message]
2023-06-15 17:45 ` [PATCH 2/2] trace-cmd: Add explicit pthread and dl dependency to meson Daniel Wagner
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=20230615174500.9158-1-dwagner@suse.de \
--to=dwagner@suse.de \
--cc=linux-trace-devel@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=tonyj@suse.com \
/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).