forked from pool/trace-cmd
- Add explicit thread dependency for older versions of meson (i.e SLE-15-SP5) New patch: libtracecmd-add-explicit-meson-thread-dependency.patch New patch: tracecmd-add-explicit-meson-thread-dependency.patch - Update to version 3.2 * Add trace-attach.c to meson build * Add initial support for meson * Quiet valgrind from reporting forked children * Close handle after opening * Fix memory leaks of followers * Add Makefile target for memory test * Update the version to the development * Add new command "attach" * Add tracecmd_get_tsc2nsec() API * Unlock records in tracecmd_iterate_events() * Add "IP" to -N argument in help message * Remove redundant check of instance in allocate_instance() * Free buf_from in error path of tracecmd_compress_copy_from() * Update v7 trace.dat documentation to clarify the strings section * Do not destroy existing instances * Do not extract top level unless told to * Fix tracecmd_compress_copy_from() write size return * Document filter scope * Support global filters * Ensure filter is applied to single input file * Open code execvp routine to avoid multiple execve syscalls - Drop patches (upstream): * 0001-libtracecmd-Add-initial-support-for-meson.patch * 0002-trace-cmd-Add-initial-support-for-meson.patch OBS-URL: https://build.opensuse.org/request/show/1093518 OBS-URL: https://build.opensuse.org/package/show/devel:tools/trace-cmd?expand=0&rev=44
56 lines
1.7 KiB
Diff
56 lines
1.7 KiB
Diff
From: Daniel Wagner <dwagner@suse.de>
|
|
Date: Thu Jun 15 11:48:53 AM PDT 2023
|
|
Subject: libtracecmd: Add explicit meson thread dependency
|
|
Patch-mainline: mailed to mailing list
|
|
References: none
|
|
Signed-off-by: Tony Jones <tonyj@suse.de>
|
|
|
|
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
|
|
|