1
0
forked from pool/libtracefs

Accepting request 893163 from home:dfaggioli:perf

- Update to new upstream version (1.2.0)
- drop patch 294319.patch (already present upstream)

OBS-URL: https://build.opensuse.org/request/show/893163
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libtracefs?expand=0&rev=2
This commit is contained in:
Jan Engelhardt 2021-05-14 18:04:16 +00:00 committed by Git OBS Bridge
parent 96b42b44e1
commit ff7116d1b2
5 changed files with 16 additions and 53 deletions

View File

@ -1,47 +0,0 @@
From e1f6b50e194d0da8fec4510acfe3a08d37a3736b Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Date: Wed, 23 Dec 2020 10:31:24 -0500
Subject: [PATCH] libtracefs: Do not show the full version in the library
SONAME
The SONAME of the library should point to the same object as the
libtracefs.so does. Since the soft link libtracefs.so points to
libtracefs.so.1, then so should the SONAME of the executable.
Reported-by: Jan Engelhardt <ej+bko@inai.de>
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=210875
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
scripts/utils.mk | 2 +-
src/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/utils.mk b/scripts/utils.mk
index 7742e19..32a9b3c 100644
--- a/scripts/utils.mk
+++ b/scripts/utils.mk
@@ -56,7 +56,7 @@ do_build_static_lib = \
do_compile_shared_library = \
($(print_shared_lib_compile) \
- $(CC) --shared $^ '-Wl,-soname,$(@F),-rpath=$$ORIGIN' -o $@ $(LIBS))
+ $(CC) --shared $^ '-Wl,-soname,$(1),-rpath=$$ORIGIN' -o $@ $(LIBS))
do_compile_plugin_obj = \
($(print_plugin_obj_compile) \
diff --git a/src/Makefile b/src/Makefile
index 52f17af..3f64905 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -17,7 +17,7 @@ $(LIBTRACEFS_STATIC): $(OBJS)
$(Q)$(call do_build_static_lib)
$(LIBTRACEFS_SHARED): $(OBJS)
- $(Q)$(call do_compile_shared_library)
+ $(Q)$(call do_compile_shared_library,$(notdir $(LIBTRACEFS_SHARED_VERSION)))
$(LIBTRACEFS_SHARED_VERSION): $(LIBTRACEFS_SHARED)
@ln -sf $(<F) $@
--
2.25.4

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e733d419a5bd4c2da993094e81ba59df1f07a553ce7aa36143b55cbea75ed293
size 39495

3
libtracefs-1.2.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2a0ae8313c4530fca2dea17451c67f49b2703fc4c1a009ff9c71086c2ab8f900
size 62224

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri May 14 15:06:28 UTC 2021 - Dario Faggioli <dfaggioli@suse.com>
- Update to new upstream version (1.2.0)
-------------------------------------------------------------------
Mon May 10 08:03:05 UTC 2021 - Dario Faggioli <dfaggioli@suse.com>
- update to new upstream version (1.1.2)
- drop patch 294319.patch (already present upstream)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 22 19:28:57 UTC 2020 - Jan Engelhardt <jengelh@inai.de> Tue Dec 22 19:28:57 UTC 2020 - Jan Engelhardt <jengelh@inai.de>

View File

@ -18,14 +18,13 @@
Name: libtracefs Name: libtracefs
%define lname libtracefs1 %define lname libtracefs1
Version: 1.0.0 Version: 1.2.0
Release: 0 Release: 0
Summary: Linux kernel trace file system library Summary: Linux kernel trace file system library
License: LGPL-2.1-only License: LGPL-2.1-only
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
URL: https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/ URL: https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/
Source: https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/libtracefs-%version.tar.gz Source: https://git.kernel.org/pub/scm/libs/libtrace/%{name}.git/snapshot/%{name}-%version.tar.gz
Patch1: 294319.patch
BuildRequires: pkgconfig(libtraceevent) BuildRequires: pkgconfig(libtraceevent)
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: xz BuildRequires: xz