mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 13:09:50 +00:00
libtraceevent: upgrade 1.8.2 -> 1.8.3
Drop backport. (From OE-Core rev: 1125dc6679c72c6b377d802009c908465626a3e6) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
d85d7419e4
commit
ae5de774f3
@@ -1,45 +0,0 @@
|
|||||||
From 7f88c9ba5f27276e844252500a9f0ba2b350b919 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ross Burton <ross.burton@arm.com>
|
|
||||||
Date: Sun, 27 Aug 2023 20:57:44 +0100
|
|
||||||
Subject: [PATCH] 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
|
|
||||||
|
|
||||||
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>
|
|
||||||
---
|
|
||||||
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
-2
@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97
|
|||||||
file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd"
|
file://LICENSES/LGPL-2.1;md5=b370887980db5dd40659b50909238dbd"
|
||||||
SECTION = "libs"
|
SECTION = "libs"
|
||||||
|
|
||||||
SRCREV = "6f6d5802f31992e7527a4c32b43a32fda6bf6bdf"
|
SRCREV = "645a883516e343ee970ebb80398cfd7b7dbd227e"
|
||||||
SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;branch=${BPN};protocol=https \
|
SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;branch=${BPN};protocol=https \
|
||||||
file://meson.patch"
|
"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
Reference in New Issue
Block a user