From 50148dfbaa89ba0de79a120e30c151606b4f1a54 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 25 Dec 2016 08:53:44 +0100 Subject: [PATCH] - updated to 2.9.0 - updated link patch --- lttng-ust-link.patch | 26 +++++++++++++++++++++++--- lttng-ust.spec | 15 +++++++++++---- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/lttng-ust-link.patch b/lttng-ust-link.patch index 2df7b8e..642657b 100644 --- a/lttng-ust-link.patch +++ b/lttng-ust-link.patch @@ -1,6 +1,14 @@ ---- lttng-ust-2.4.0/liblttng-ust/Makefile.am.orig 2014-02-28 19:20:10.000000000 +0100 -+++ lttng-ust-2.4.0/liblttng-ust/Makefile.am 2014-03-03 10:55:00.270969760 +0100 -@@ -67,6 +67,7 @@ +--- lttng-ust-2.9.0/liblttng-ust/Makefile.am.orig 2016-11-29 02:46:24.000000000 +0100 ++++ lttng-ust-2.9.0/liblttng-ust/Makefile.am 2016-12-25 00:30:14.048415399 +0100 +@@ -14,6 +14,7 @@ + error.h + liblttng_ust_tracepoint_la_LIBADD = \ + -lurcu-bp \ ++ -ldl \ + -lpthread \ + $(top_builddir)/snprintf/libustsnprintf.la + liblttng_ust_tracepoint_la_LDFLAGS = -no-undefined -version-info $(LTTNG_UST_LIBRARY_VERSION) +@@ -87,6 +88,7 @@ $(top_builddir)/libringbuffer/libringbuffer.la liblttng_ust_la_LIBADD = \ @@ -61,3 +69,15 @@ - -L$(top_builddir)/liblttng-ust/.libs +liblttng_ust_python_agent_la_LIBADD = -lc \ + $(top_builddir)/liblttng-ust/liblttng-ust.la +--- lttng-ust-2.9.0/liblttng-ust-fd/Makefile.am.orig 2016-11-29 02:46:24.000000000 +0100 ++++ lttng-ust-2.9.0/liblttng-ust-fd/Makefile.am 2016-12-25 00:31:01.575081525 +0100 +@@ -5,7 +5,8 @@ + liblttng_ust_fd_la_SOURCES = \ + lttng-ust-fd.c + liblttng_ust_fd_la_LIBADD = \ +- $(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la ++ $(top_builddir)/liblttng-ust-comm/liblttng-ust-comm.la \ ++ $(top_builddir)/liblttng-ust/liblttng-ust.la + + if LTTNG_UST_BUILD_WITH_LIBDL + liblttng_ust_fd_la_LIBADD += -ldl diff --git a/lttng-ust.spec b/lttng-ust.spec index de1801c..4b0bf0b 100644 --- a/lttng-ust.spec +++ b/lttng-ust.spec @@ -7,22 +7,24 @@ Summary: LTTng Userspace Tracer Summary(pl.UTF-8): LTTng Userspace Tracer - narzędzia LTTng do śledzenia przestrzeni użytkownika Name: lttng-ust -Version: 2.8.1 +Version: 2.9.0 Release: 1 License: LGPL v2.1 (library), MIT (headers), GPL v2 (programs) Group: Libraries Source0: http://lttng.org/files/lttng-ust/%{name}-%{version}.tar.bz2 -# Source0-md5: be505077245dc05f93370a565eec15f4 +# Source0-md5: 77f3378ba37a36801420bce87b702e9c Patch0: %{name}-link.patch Patch1: %{name}-java.patch Patch2: %{name}-python.patch URL: http://lttng.org/ust BuildRequires: autoconf >= 2.50 BuildRequires: automake >= 1:1.9 -BuildRequires: rpmbuild(macros) >= 1.294 +# for examples build +BuildRequires: cmake >= 2.8.11 BuildRequires: libstdc++-devel BuildRequires: libtool >= 2:2 %{?with_python:BuildRequires: python >= 1:2.7} +BuildRequires: rpmbuild(macros) >= 1.294 %{?with_systemtap:BuildRequires: systemtap-sdt-devel} BuildRequires: userspace-rcu-devel >= 0.7.2 %if %{with java} @@ -35,7 +37,7 @@ ExclusiveArch: %{ix86} %{x8664} x32 arm aarch64 mips ppc ppc64 s390 s390x tile BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # non-function rcu_reader_bp symbol -%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-tracepoint\.so.* +%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.* @@ -168,6 +170,8 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %ghost %{_libdir}/liblttng-ust-cyg-profile-fast.so.0 %attr(755,root,root) %{_libdir}/liblttng-ust-dl.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/liblttng-ust-dl.so.0 +%attr(755,root,root) %{_libdir}/liblttng-ust-fd.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-fd.so.0 %attr(755,root,root) %{_libdir}/liblttng-ust-fork.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/liblttng-ust-fork.so.0 %attr(755,root,root) %{_libdir}/liblttng-ust-libc-wrapper.so.*.*.* @@ -185,6 +189,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/liblttng-ust-cyg-profile.so %attr(755,root,root) %{_libdir}/liblttng-ust-cyg-profile-fast.so %attr(755,root,root) %{_libdir}/liblttng-ust-dl.so +%attr(755,root,root) %{_libdir}/liblttng-ust-fd.so %attr(755,root,root) %{_libdir}/liblttng-ust-fork.so %attr(755,root,root) %{_libdir}/liblttng-ust-libc-wrapper.so %attr(755,root,root) %{_libdir}/liblttng-ust-pthread-wrapper.so @@ -194,6 +199,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/liblttng-ust-cyg-profile.la %{_libdir}/liblttng-ust-cyg-profile-fast.la %{_libdir}/liblttng-ust-dl.la +%{_libdir}/liblttng-ust-fd.la %{_libdir}/liblttng-ust-fork.la %{_libdir}/liblttng-ust-libc-wrapper.la %{_libdir}/liblttng-ust-pthread-wrapper.la @@ -218,6 +224,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/liblttng-ust-cyg-profile.a %{_libdir}/liblttng-ust-cyg-profile-fast.a %{_libdir}/liblttng-ust-dl.a +%{_libdir}/liblttng-ust-fd.a %{_libdir}/liblttng-ust-fork.a %{_libdir}/liblttng-ust-libc-wrapper.a %{_libdir}/liblttng-ust-pthread-wrapper.a -- 2.44.0