[packages/lttng-ust] - updated to 2.13.1 (new sonames) - updated link,java,python patches
qboosh
qboosh at pld-linux.org
Sat Feb 5 15:53:28 CET 2022
commit ec86b2a89ce125375e48f54d4cc25d238ff97936
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Feb 5 15:55:00 2022 +0100
- updated to 2.13.1 (new sonames)
- updated link,java,python patches
lttng-ust-java.patch | 6 ++---
lttng-ust-link.patch | 62 ++++++++------------------------------------------
lttng-ust-python.patch | 14 ++++++------
lttng-ust.spec | 51 ++++++++++++++++++++++++-----------------
4 files changed, 49 insertions(+), 84 deletions(-)
---
diff --git a/lttng-ust.spec b/lttng-ust.spec
index 4c3e846..93890a0 100644
--- a/lttng-ust.spec
+++ b/lttng-ust.spec
@@ -8,34 +8,35 @@
Summary: LTTng Userspace Tracer
Summary(pl.UTF-8): LTTng Userspace Tracer - narzędzia LTTng do śledzenia przestrzeni użytkownika
Name: lttng-ust
-Version: 2.12.1
-Release: 3
+Version: 2.13.1
+Release: 1
License: LGPL v2.1 (library), MIT (headers), GPL v2 (programs)
Group: Libraries
Source0: https://lttng.org/files/lttng-ust/%{name}-%{version}.tar.bz2
-# Source0-md5: 11787d1df69b04dd7431614ab43b2e12
+# Source0-md5: 655f0d049a8feb694af6646d3a696d7a
Patch0: %{name}-link.patch
Patch1: %{name}-java.patch
Patch2: %{name}-python.patch
URL: https://lttng.org/
-BuildRequires: autoconf >= 2.59
+BuildRequires: autoconf >= 2.69
BuildRequires: automake >= 1:1.12
# for examples build
BuildRequires: cmake >= 2.8.11
-BuildRequires: libstdc++-devel
+BuildRequires: libstdc++-devel >= 6:4.7
BuildRequires: libtool >= 2:2
BuildRequires: numactl-devel
+BuildRequires: pkgconfig
%{?with_python:BuildRequires: python >= 1:2.7}
BuildRequires: rpmbuild(macros) >= 1.294
BuildRequires: sed >= 4.0
%{?with_systemtap:BuildRequires: systemtap-sdt-devel}
-BuildRequires: userspace-rcu-devel >= 0.11
+BuildRequires: userspace-rcu-devel >= 0.13
%if %{with java}
BuildRequires: java-log4j
BuildRequires: jdk
BuildRequires: jpackage-utils
%endif
-Requires: userspace-rcu >= 0.11
+Requires: userspace-rcu >= 0.13
ExclusiveArch: %{ix86} %{x8664} x32 %{arm} aarch64 mips ppc ppc64 s390 s390x tile
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -43,8 +44,10 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define skip_post_check_so_1 liblttng-ust\.so.* liblttng-ust-cyg-profile\.so.* liblttng-ust-cyg-profile-fast\.so.* liblttng-ust-dl\.so.* liblttng-ust-java\.so.* liblttng-ust-python-agent\.so.* liblttng-ust-tracepoint\.so.*
# non-function lttng_ust_context_info_tls symbol
%define skip_post_check_so_2 liblttng-ust-jul-jni\.so.* liblttng-ust-log4j-jni\.so.*
+# lttng_ust_sigbus_state symbol must be defined in executable
+%define skip_post_check_so_3 liblttng-ust-ctl\.so.*
-%define skip_post_check_so %{skip_post_check_so_1} %{skip_post_check_so_2}
+%define skip_post_check_so %{skip_post_check_so_1} %{skip_post_check_so_2} %{skip_post_check_so_3}
%description
The LTTng Userspace Tracer (UST) is a library accompanied by a set of
@@ -59,7 +62,7 @@ Summary: Header files for LTTNG-UST libraries
Summary(pl.UTF-8): Pliki nagłówkowe bibliotek LTTNG-UST
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: userspace-rcu-devel >= 0.11
+Requires: userspace-rcu-devel >= 0.13
%{?with_systemtap:Requires: systemtap-sdt-devel}
%description devel
@@ -167,32 +170,35 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc COPYING ChangeLog README.md
+%doc ChangeLog LICENSE README.md
%attr(755,root,root) %{_libdir}/liblttng-ust.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblttng-ust.so.0
+%attr(755,root,root) %ghost %{_libdir}/liblttng-ust.so.1
+%attr(755,root,root) %{_libdir}/liblttng-ust-common.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-common.so.1
%attr(755,root,root) %{_libdir}/liblttng-ust-ctl.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-ctl.so.4
+%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-ctl.so.5
%attr(755,root,root) %{_libdir}/liblttng-ust-cyg-profile.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-cyg-profile.so.0
+%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-cyg-profile.so.1
%attr(755,root,root) %{_libdir}/liblttng-ust-cyg-profile-fast.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-cyg-profile-fast.so.0
+%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-cyg-profile-fast.so.1
%attr(755,root,root) %{_libdir}/liblttng-ust-dl.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-dl.so.0
+%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-dl.so.1
%attr(755,root,root) %{_libdir}/liblttng-ust-fd.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-fd.so.0
+%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-fd.so.1
%attr(755,root,root) %{_libdir}/liblttng-ust-fork.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-fork.so.0
+%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-fork.so.1
%attr(755,root,root) %{_libdir}/liblttng-ust-libc-wrapper.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-libc-wrapper.so.0
+%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-libc-wrapper.so.1
%attr(755,root,root) %{_libdir}/liblttng-ust-pthread-wrapper.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-pthread-wrapper.so.0
+%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-pthread-wrapper.so.1
%attr(755,root,root) %{_libdir}/liblttng-ust-tracepoint.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-tracepoint.so.0
+%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-tracepoint.so.1
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/lttng-gen-tp
%attr(755,root,root) %{_libdir}/liblttng-ust.so
+%attr(755,root,root) %{_libdir}/liblttng-ust-common.so
%attr(755,root,root) %{_libdir}/liblttng-ust-ctl.so
%attr(755,root,root) %{_libdir}/liblttng-ust-cyg-profile.so
%attr(755,root,root) %{_libdir}/liblttng-ust-cyg-profile-fast.so
@@ -203,6 +209,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/liblttng-ust-pthread-wrapper.so
%attr(755,root,root) %{_libdir}/liblttng-ust-tracepoint.so
%{_libdir}/liblttng-ust.la
+%{_libdir}/liblttng-ust-common.la
%{_libdir}/liblttng-ust-ctl.la
%{_libdir}/liblttng-ust-cyg-profile.la
%{_libdir}/liblttng-ust-cyg-profile-fast.la
@@ -220,6 +227,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/lttng-ust.3*
%{_mandir}/man3/lttng-ust-cyg-profile.3*
%{_mandir}/man3/lttng-ust-dl.3*
+%{_mandir}/man3/lttng_ust_*.3*
%{_mandir}/man3/tracef.3*
%{_mandir}/man3/tracelog.3*
%{_mandir}/man3/tracepoint.3*
@@ -230,6 +238,7 @@ rm -rf $RPM_BUILD_ROOT
%files static
%defattr(644,root,root,755)
%{_libdir}/liblttng-ust.a
+%{_libdir}/liblttng-ust-common.a
%{_libdir}/liblttng-ust-ctl.a
%{_libdir}/liblttng-ust-cyg-profile.a
%{_libdir}/liblttng-ust-cyg-profile-fast.a
@@ -273,7 +282,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n python-lttng-ust
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/liblttng-ust-python-agent.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-python-agent.so.0
+%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-python-agent.so.1
%attr(755,root,root) %{_libdir}/liblttng-ust-python-agent.so
%{py_sitescriptdir}/lttngust
%{py_sitescriptdir}/lttngust-%{version}-py*.egg-info
diff --git a/lttng-ust-java.patch b/lttng-ust-java.patch
index eee729c..8b79cd5 100644
--- a/lttng-ust-java.patch
+++ b/lttng-ust-java.patch
@@ -1,6 +1,6 @@
---- lttng-ust-2.12.1/liblttng-ust-java/Makefile.am.orig 2021-02-26 18:55:34.153038775 +0100
-+++ lttng-ust-2.12.1/liblttng-ust-java/Makefile.am 2021-02-26 18:58:12.021196975 +0100
-@@ -26,7 +26,7 @@
+--- lttng-ust-2.13.1/src/lib/lttng-ust-java/Makefile.am.orig 2021-12-09 20:45:58.000000000 +0100
++++ lttng-ust-2.13.1/src/lib/lttng-ust-java/Makefile.am 2022-02-05 10:59:11.838865926 +0100
+@@ -29,7 +29,7 @@ org_lttng_ust_LTTngUst.h: $(jarfile)
else
org_lttng_ust_LTTngUst.h: jni-header.stamp
diff --git a/lttng-ust-link.patch b/lttng-ust-link.patch
index b8a57cc..f4bdd6e 100644
--- a/lttng-ust-link.patch
+++ b/lttng-ust-link.patch
@@ -1,53 +1,9 @@
---- lttng-ust-2.6.0/liblttng-ust-java/Makefile.am.orig 2015-01-26 21:09:30.334240517 +0100
-+++ lttng-ust-2.6.0/liblttng-ust-java/Makefile.am 2015-01-26 21:11:19.994235912 +0100
-@@ -12,7 +12,7 @@
- liblttng_ust_java_la_SOURCES = LTTngUst.c lttng_ust_java.h
- nodist_liblttng_ust_java_la_SOURCES = org_lttng_ust_LTTngUst.h
-
--liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
-+liblttng_ust_java_la_LIBADD = -lc $(top_builddir)/liblttng-ust/liblttng-ust.la
-
- $(jarfile): classnoinst.stamp
- $(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.class
---- lttng-ust-2.8.1/liblttng-ust-java-agent/jni/jul/Makefile.am.orig 2016-06-25 12:12:34.117486360 +0200
-+++ lttng-ust-2.8.1/liblttng-ust-java-agent/jni/jul/Makefile.am 2016-06-25 12:14:28.320201004 +0200
-@@ -7,7 +7,5 @@
- nodist_liblttng_ust_jul_jni_la_SOURCES = org_lttng_ust_agent_jul_LttngJulApi.h
-
- liblttng_ust_jul_jni_la_LIBADD = -lc \
-- -L$(top_builddir)/liblttng-ust/.libs \
-- -L$(top_builddir)/liblttng-ust-java-agent/jni/common/.libs \
-- -llttng-ust-context-jni \
-- -llttng-ust
-+ $(top_builddir)/liblttng-ust-java-agent/jni/common/liblttng-ust-context-jni.la \
-+ $(top_builddir)/liblttng-ust/liblttng-ust.la
---- lttng-ust-2.8.1/liblttng-ust-java-agent/jni/log4j/Makefile.am.orig 2016-06-25 12:12:34.117486360 +0200
-+++ lttng-ust-2.8.1/liblttng-ust-java-agent/jni/log4j/Makefile.am 2016-06-25 12:15:29.779868049 +0200
-@@ -7,7 +7,5 @@
- nodist_liblttng_ust_log4j_jni_la_SOURCES = org_lttng_ust_agent_log4j_LttngLog4jApi.h
-
- liblttng_ust_log4j_jni_la_LIBADD = -lc \
-- -L$(top_builddir)/liblttng-ust/.libs \
-- -L$(top_builddir)/liblttng-ust-java-agent/jni/common/.libs \
-- -llttng-ust-context-jni \
-- -llttng-ust
-+ $(top_builddir)/liblttng-ust-java-agent/jni/common/liblttng-ust-context-jni.la \
-+ $(top_builddir)/liblttng-ust/liblttng-ust.la
---- lttng-ust-2.8.1/liblttng-ust-java-agent/jni/common/Makefile.am.orig 2016-05-31 06:38:27.000000000 +0200
-+++ lttng-ust-2.8.1/liblttng-ust-java-agent/jni/common/Makefile.am 2016-06-25 12:15:51.336417933 +0200
-@@ -5,4 +5,4 @@
-
- nodist_liblttng_ust_context_jni_la_SOURCES = org_lttng_ust_agent_context_LttngContextApi.h
-
--liblttng_ust_context_jni_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
-+liblttng_ust_context_jni_la_LIBADD = -lc $(top_builddir)/liblttng-ust/liblttng-ust.la
---- lttng-ust-2.12.1/liblttng-ust-python-agent/Makefile.am.orig 2021-02-26 18:44:15.434630867 +0100
-+++ lttng-ust-2.12.1/liblttng-ust-python-agent/Makefile.am 2021-02-26 18:46:37.011947396 +0100
-@@ -4,5 +4,5 @@
- AM_CFLAGS += -fno-strict-aliasing
- lib_LTLIBRARIES = liblttng-ust-python-agent.la
- liblttng_ust_python_agent_la_SOURCES = lttng_ust_python.c lttng_ust_python.h
--liblttng_ust_python_agent_la_LIBADD = -lc -llttng-ust \
-- -L$(top_builddir)/liblttng-ust/.libs
-+liblttng_ust_python_agent_la_LIBADD = -lc \
-+ $(top_builddir)/liblttng-ust/liblttng-ust.la
+urcu is needed for cds_list_for_each_entry_rcu (rcu_dereference_sym symbol)
+--- lttng-ust-2.13.1/src/lib/lttng-ust-ctl/Makefile.am.orig 2021-12-09 20:45:58.000000000 +0100
++++ lttng-ust-2.13.1/src/lib/lttng-ust-ctl/Makefile.am 2022-02-05 13:08:04.746973171 +0100
+@@ -16,4 +16,5 @@ liblttng_ust_ctl_la_LIBADD = \
+ $(top_builddir)/src/common/libcounter-clients.la \
+ $(top_builddir)/src/common/libustcomm.la \
+ $(top_builddir)/src/common/libcommon.la \
++ $(URCU_LIBS) \
+ $(DL_LIBS)
diff --git a/lttng-ust-python.patch b/lttng-ust-python.patch
index 8632bab..b9dd320 100644
--- a/lttng-ust-python.patch
+++ b/lttng-ust-python.patch
@@ -1,11 +1,11 @@
---- lttng-ust-2.8.1/python-lttngust/Makefile.am.orig 2016-05-31 06:38:27.000000000 +0200
-+++ lttng-ust-2.8.1/python-lttngust/Makefile.am 2016-06-25 12:26:23.159661719 +0200
-@@ -6,7 +6,7 @@
- $(PYTHON) setup.py build --verbose
+--- lttng-ust-2.13.1/src/python-lttngust/Makefile.am.orig 2021-12-09 20:45:58.000000000 +0100
++++ lttng-ust-2.13.1/src/python-lttngust/Makefile.am 2022-02-05 10:58:51.238977525 +0100
+@@ -28,7 +28,7 @@ build-python-bindings.stamp: copy-static
+ touch $@
- install-exec-local:
-- @opts="--prefix=$(prefix) --verbose --no-compile $(DISTSETUPOPTS)"; \
-+ @opts="--prefix=$(prefix) --install-purelib=$(pythondir) --verbose --optimize=2 $(DISTSETUPOPTS)"; \
+ install-exec-local: build-python-bindings.stamp
+- @opts="--prefix=$(prefix) --record $(INSTALLED_FILES) --verbose --no-compile $(DISTSETUPOPTS)"; \
++ @opts="--prefix=$(prefix) --install-purelib=$(pythondir) --record $(INSTALLED_FILES) --verbose --no-compile $(DISTSETUPOPTS)"; \
if [ "$(DESTDIR)" != "" ]; then \
opts="$$opts --root=$(DESTDIR)"; \
fi; \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lttng-ust.git/commitdiff/ec86b2a89ce125375e48f54d4cc25d238ff97936
More information about the pld-cvs-commit
mailing list