- updated to 2.8.1

- updated link,python patches
- non-parallel make (race with java headers generation)

diff --git a/lttng-ust-link.patch b/lttng-ust-link.patch
index 6ae97a2b2fc9d5b029ff68d6b4ea38317041e217..2df7b8e4e21a2084f5314f01737e09c16bb25c06 100644 (file)
--- a/lttng-ust-link.patch
+++ b/lttng-ust-link.patch
@@ -19,19 +19,45 @@
  
  $(jarfile): classnoinst.stamp
        $(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.class
---- lttng-ust-2.6.0/liblttng-ust-java-agent/jni/jul/Makefile.am.orig   2015-01-26 20:39:58.000000000 +0100
-+++ lttng-ust-2.6.0/liblttng-ust-java-agent/jni/jul/Makefile.am        2015-01-26 21:17:08.297554669 +0100
-@@ -6,4 +6,4 @@
+--- 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
  
- nodist_liblttng_ust_jul_jni_la_SOURCES = org_lttng_ust_agent_jul_LTTngLogHandler.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_jul_jni_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
-+liblttng_ust_jul_jni_la_LIBADD = -lc $(top_builddir)/liblttng-ust/liblttng-ust.la
---- lttng-ust-2.6.0/liblttng-ust-java-agent/jni/log4j/Makefile.am.orig 2015-01-26 20:39:58.000000000 +0100
-+++ lttng-ust-2.6.0/liblttng-ust-java-agent/jni/log4j/Makefile.am      2015-01-26 21:17:37.837553389 +0100
+ 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_log4j_jni_la_SOURCES = org_lttng_ust_agent_log4j_LTTngLogAppender.h
+ nodist_liblttng_ust_context_jni_la_SOURCES = org_lttng_ust_agent_context_LttngContextApi.h
  
--liblttng_ust_log4j_jni_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
-+liblttng_ust_log4j_jni_la_LIBADD = -lc $(top_builddir)/liblttng-ust/liblttng-ust.la
+-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.8.1/liblttng-ust-python-agent/Makefile.am.orig 2016-06-25 12:16:24.649570794 +0200
++++ lttng-ust-2.8.1/liblttng-ust-python-agent/Makefile.am      2016-06-25 12:19:01.568720691 +0200
+@@ -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

diff --git a/lttng-ust-python.patch b/lttng-ust-python.patch
index 7b111a6f6920f309108e52c9e39cb83cc614e2ef..8632babf224f8eaba1efdd5a1a2449d5f72630a9 100644 (file)
--- a/lttng-ust-python.patch
+++ b/lttng-ust-python.patch
@@ -1,6 +1,6 @@
---- lttng-ust-2.7.1/liblttng-ust-python-agent/Makefile.am.orig 2016-01-25 22:11:19.823939945 +0100
-+++ lttng-ust-2.7.1/liblttng-ust-python-agent/Makefile.am      2016-01-25 22:12:22.277270532 +0100
-@@ -15,7 +15,7 @@
+--- 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
  
  install-exec-local:

diff --git a/lttng-ust.spec b/lttng-ust.spec
index 8683e5435df4f59aaef590290193435496a84e21..de1801c35037f511252ddc8e70b1c34ccf65b5e4 100644 (file)
--- a/lttng-ust.spec
+++ b/lttng-ust.spec
@@ -7,18 +7,18 @@
 Summary:       LTTng Userspace Tracer
 Summary(pl.UTF-8):     LTTng Userspace Tracer - narzędzia LTTng do śledzenia przestrzeni użytkownika
 Name:          lttng-ust
-Version:       2.7.2
+Version:       2.8.1
 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: 2fb8c45ce5e92fb0f2c12152681db8c8
+# Source0-md5: be505077245dc05f93370a565eec15f4
 Patch0:                %{name}-link.patch
 Patch1:                %{name}-java.patch
 Patch2:                %{name}-python.patch
 URL:           http://lttng.org/ust
 BuildRequires: autoconf >= 2.50
-BuildRequires: automake
+BuildRequires: automake >= 1:1.9
 BuildRequires: rpmbuild(macros) >= 1.294
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 2:2
@@ -34,8 +34,12 @@ Requires:    userspace-rcu >= 0.7.2
 ExclusiveArch: %{ix86} %{x8664} x32 arm aarch64 mips ppc ppc64 s390 s390x tile
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# rcu_reader_bp is not a function, but some kind of symbol that check doesn't support
-%define                skip_post_check_so      liblttng-ust\.so.* liblttng-ust-cyg-profile\.so.* liblttng-ust-cyg-profile-fast\.so.* liblttng-ust-dl\.so.* liblttng-ust-tracepoint\.so.*
+# 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.*
+# non-function lttng_ust_context_info_tls symbol
+%define                skip_post_check_so_2    liblttng-ust-jul-jni\.so.* liblttng-ust-log4j-jni\.so.*
+
+%define                skip_post_check_so      %{skip_post_check_so_1} %{skip_post_check_so_2}
 
 %description
 The LTTng Userspace Tracer (UST) is a library accompanied by a set of
@@ -115,7 +119,7 @@ export CLASSPATH=.:%{_javadir}/log4j.jar
        %{?with_python:--enable-python-agent} \
        %{?with_systemtap:--with-sdt}
 
-%{__make}
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -132,7 +136,7 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/lttng-ust/{ChangeLog,README.md,java-agent.txt}
 
 %if %{with java}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/liblttng-ust-{java,jul-jni,log4j-jni}.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/liblttng-ust-{context-jni,java,jul-jni,log4j-jni}.{la,a}
 %endif
 %if %{with python}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/liblttng-ust-python-agent.{la,a}
@@ -197,9 +201,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/lttng
 %{_pkgconfigdir}/lttng-ust.pc
 %{_mandir}/man1/lttng-gen-tp.1*
+%{_mandir}/man3/do_tracepoint.3*
 %{_mandir}/man3/lttng-ust.3*
 %{_mandir}/man3/lttng-ust-cyg-profile.3*
 %{_mandir}/man3/lttng-ust-dl.3*
+%{_mandir}/man3/tracef.3*
+%{_mandir}/man3/tracelog.3*
+%{_mandir}/man3/tracepoint.3*
+%{_mandir}/man3/tracepoint_enabled.3*
 %{_examplesdir}/%{name}-%{version}
 
 %files static
@@ -218,6 +227,9 @@ rm -rf $RPM_BUILD_ROOT
 %files -n java-lttng-ust
 %defattr(644,root,root,755)
 %doc doc/java-agent.txt
+%attr(755,root,root) %{_libdir}/liblttng-ust-context-jni.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-context-jni.so.0
+%attr(755,root,root) %{_libdir}/liblttng-ust-context-jni.so
 %attr(755,root,root) %{_libdir}/liblttng-ust-java.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liblttng-ust-java.so.0
 %attr(755,root,root) %{_libdir}/liblttng-ust-java.so
@@ -227,10 +239,16 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/liblttng-ust-log4j-jni.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liblttng-ust-log4j-jni.so.0
 %attr(755,root,root) %{_libdir}/liblttng-ust-log4j-jni.so
-%{_javadir}/liblttng-ust-agent-1.0.0.jar
 %{_javadir}/liblttng-ust-agent.jar
 %{_javadir}/liblttng-ust-java.jar
-%{_javadir}/liblttng-ust-jul.jar
+%{_javadir}/lttng-ust-agent-all-1.0.0.jar
+%{_javadir}/lttng-ust-agent-all.jar
+%{_javadir}/lttng-ust-agent-common-1.0.0.jar
+%{_javadir}/lttng-ust-agent-common.jar
+%{_javadir}/lttng-ust-agent-jul-1.0.0.jar
+%{_javadir}/lttng-ust-agent-jul.jar
+%{_javadir}/lttng-ust-agent-log4j-1.0.0.jar
+%{_javadir}/lttng-ust-agent-log4j.jar
 %endif
 
 %if %{with python}