- updated to 2.4.0

- updated link patch
- removed java patch (replaced by setting CLASSPATH to . at build time)

diff --git a/lttng-ust-java.patch b/lttng-ust-java.patch
deleted file mode 100644 (file)
index a5cb454..0000000
--- a/lttng-ust-java.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- lttng-ust-2.3.1/liblttng-ust-java/Makefile.am.orig 2013-11-15 21:21:13.337850224 +0100
-+++ lttng-ust-2.3.1/liblttng-ust-java/Makefile.am      2013-11-15 21:29:47.031161998 +0100
-@@ -8,7 +8,7 @@
- dist_noinst_DATA = LTTngUst.java
- liblttng_ust_java_la_LIBADD = $(top_builddir)/liblttng-ust/liblttng-ust.la -ldl
- 
--all: LTTngUst.class org_lttng_ust_LTTngUst.h liblttng-ust-java.jar
-+all: org/lttng/ust/LTTngUst.class org_lttng_ust_LTTngUst.h liblttng-ust-java.jar
- 
- clean-local:
-       rm -f org_lttng_ust_LTTngUst.h
-@@ -17,13 +17,13 @@
- 
- LTTngUst.c: org_lttng_ust_LTTngUst.h
- 
--LTTngUst.class: LTTngUst.java
-+org/lttng/ust/LTTngUst.class: LTTngUst.java
-       javac -d "$(builddir)" "$(srcdir)/LTTngUst.java"
- 
--org_lttng_ust_LTTngUst.h: LTTngUst.class
--      javah org.lttng.ust.LTTngUst
-+org_lttng_ust_LTTngUst.h: org/lttng/ust/LTTngUst.class
-+      javah -classpath . org.lttng.ust.LTTngUst
- 
--liblttng-ust-java.jar: LTTngUst.class
-+liblttng-ust-java.jar: org/lttng/ust/LTTngUst.class
-       jar cf liblttng-ust-java.jar org/*
- 
- endif

diff --git a/lttng-ust-link.patch b/lttng-ust-link.patch
index ffcafa4810ee6deb84aae99eeb3e9485284fd3d2..44e502eeb95e5a41002e63fd81ba3033b05b6719 100644 (file)
--- a/lttng-ust-link.patch
+++ b/lttng-ust-link.patch
@@ -1,11 +1,32 @@
---- lttng-ust-2.2.0/liblttng-ust-java/Makefile.am.orig 2013-06-25 20:47:01.000000000 +0200
-+++ lttng-ust-2.2.0/liblttng-ust-java/Makefile.am      2013-07-05 18:09:37.362017852 +0200
-@@ -6,7 +6,7 @@
+--- lttng-ust-2.4.0/liblttng-ust-java/Makefile.am.orig 2014-03-03 08:55:13.364604698 +0100
++++ lttng-ust-2.4.0/liblttng-ust-java/Makefile.am      2014-03-03 08:57:12.334599705 +0100
+@@ -9,7 +9,7 @@
  liblttng_ust_java_la_SOURCES = LTTngUst.c lttng_ust_java.h
  nodist_liblttng_ust_java_la_SOURCES = org_lttng_ust_LTTngUst.h
- dist_noinst_DATA = LTTngUst.java
+ dist_noinst_DATA = $(LTTNG_JUST_SRCDIR)/LTTngUst.java
 -liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
 +liblttng_ust_java_la_LIBADD = $(top_builddir)/liblttng-ust/liblttng-ust.la -ldl
  
- all: LTTngUst.class org_lttng_ust_LTTngUst.h liblttng-ust-java.jar
+ if HAVE_JAVA_JDK
+ JCC=$(JAVA_JDK)/bin
+--- 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 @@
+       $(top_builddir)/libringbuffer/libringbuffer.la
+ 
+ liblttng_ust_la_LIBADD = \
++      -ldl \
+       -lpthread \
+       -lrt \
+       -lurcu-cds \
+--- lttng-ust-2.4.0/liblttng-ust-jul/Makefile.am.orig  2014-02-28 19:20:10.000000000 +0100
++++ lttng-ust-2.4.0/liblttng-ust-jul/Makefile.am       2014-03-03 10:55:41.377634701 +0100
+@@ -15,7 +15,7 @@
+       $(LTTNG_JUL_SRCDIR)/LTTngSessiondCmd2_4.java \
+       $(LTTNG_JUL_SRCDIR)/LTTngTCPSessiondClient.java \
+       $(LTTNG_JUL_SRCDIR)/LTTngThread.java
+-liblttng_ust_jul_jni_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-ust
++liblttng_ust_jul_jni_la_LIBADD = $(top_builddir)/liblttng-ust/liblttng-ust.la -ldl
+ 
+ lttnglibjava_DATA = liblttng-ust-jul.jar
  

diff --git a/lttng-ust.spec b/lttng-ust.spec
index 137b92bf9aa82899fcd4dbf7f1c1558e08b1f3f0..1a9d0c6be5de2b2a6009465cd1489e6b7e264bde 100644 (file)
--- a/lttng-ust.spec
+++ b/lttng-ust.spec
@@ -6,14 +6,13 @@
 Summary:       LTTng Userspace Tracer
 Summary(pl.UTF-8):     LTTng Userspace Tracer - narzędzia LTTng do śledzenia przestrzeni użytkownika
 Name:          lttng-ust
-Version:       2.3.1
+Version:       2.4.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: e6a3fd7d4c104b7af2e9098bba5d2499
+# Source0-md5: 6c8c3e4a339f9db11c047bd83e48c5fe
 Patch0:                %{name}-link.patch
-Patch1:                %{name}-java.patch
 URL:           http://lttng.org/ust
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -25,8 +24,8 @@ BuildRequires:        userspace-rcu-devel >= 0.7.2
 Requires:      userspace-rcu >= 0.7.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# rcu_reader_bp is some kind of symbol that check doesn't support
-%define                skip_post_check_so      liblttng-ust-cyg-profile\.so.* liblttng-ust-cyg-profile-fast\.so.* liblttng-ust-tracepoint\.so.*
+# 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.*
 
 %description
 The LTTng Userspace Tracer (UST) is a library accompanied by a set of
@@ -76,7 +75,6 @@ Interfejs JNI do biblioteki LTTng Userspace Tracer.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -84,10 +82,10 @@ Interfejs JNI do biblioteki LTTng Userspace Tracer.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%{?with_java:CPPFLAGS="%{rpmcppflags} -I%{_jvmdir}/java/include -I%{_jvmdir}/java/include/linux"}
+export CLASSPATH=.
 %configure \
        --disable-silent-rules \
-       %{?with_java:--with-jni-interface} \
+       %{?with_java:--with-java-jdk=%{java_home} --with-jni-interface} \
        %{?with_systemtap:--with-sdt}
 
 %{__make}
@@ -96,19 +94,20 @@ Interfejs JNI do biblioteki LTTng Userspace Tracer.
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       lttnglibjavadir=%{_javadir}
 
 # *.la kept - no .pc files for individual libraries
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}
 %{__mv} $RPM_BUILD_ROOT%{_docdir}/lttng-ust/examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 # packaged as %doc
-%{__rm} $RPM_BUILD_ROOT%{_docdir}/lttng-ust/{ChangeLog,README}
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/lttng-ust/{ChangeLog,README,java-util-logging.txt}
 
 %if %{with java}
 install -d $RPM_BUILD_ROOT%{_javadir}
 cp -p liblttng-ust-java/liblttng-ust-java.jar $RPM_BUILD_ROOT%{_javadir}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/liblttng-ust-java.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/liblttng-ust-{java,jul-jni}.{la,a}
 %endif
 
 %clean
@@ -131,10 +130,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/liblttng-ust-cyg-profile.so.0
 %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) %{_libdir}/liblttng-ust-dl.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-dl.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.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liblttng-ust-libc-wrapper.so.0
+%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) %{_libdir}/liblttng-ust-tracepoint.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liblttng-ust-tracepoint.so.0
 
@@ -145,21 +148,26 @@ rm -rf $RPM_BUILD_ROOT
 %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
+%attr(755,root,root) %{_libdir}/liblttng-ust-dl.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
 %attr(755,root,root) %{_libdir}/liblttng-ust-tracepoint.so
 %{_libdir}/liblttng-ust.la
 %{_libdir}/liblttng-ust-ctl.la
 %{_libdir}/liblttng-ust-cyg-profile.la
 %{_libdir}/liblttng-ust-cyg-profile-fast.la
+%{_libdir}/liblttng-ust-dl.la
 %{_libdir}/liblttng-ust-fork.la
 %{_libdir}/liblttng-ust-libc-wrapper.la
+%{_libdir}/liblttng-ust-pthread-wrapper.la
 %{_libdir}/liblttng-ust-tracepoint.la
 %{_includedir}/lttng
 %{_pkgconfigdir}/lttng-ust.pc
 %{_mandir}/man1/lttng-gen-tp.1*
 %{_mandir}/man3/lttng-ust.3*
 %{_mandir}/man3/lttng-ust-cyg-profile.3*
+%{_mandir}/man3/lttng-ust-dl.3*
 %{_examplesdir}/%{name}-%{version}
 
 %files static
@@ -168,15 +176,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/liblttng-ust-ctl.a
 %{_libdir}/liblttng-ust-cyg-profile.a
 %{_libdir}/liblttng-ust-cyg-profile-fast.a
+%{_libdir}/liblttng-ust-dl.a
 %{_libdir}/liblttng-ust-fork.a
 %{_libdir}/liblttng-ust-libc-wrapper.a
+%{_libdir}/liblttng-ust-pthread-wrapper.a
 %{_libdir}/liblttng-ust-tracepoint.a
 
 %if %{with java}
 %files -n java-lttng-ust
 %defattr(644,root,root,755)
+%doc doc/java-util-logging.txt
 %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
+%attr(755,root,root) %{_libdir}/liblttng-ust-jul-jni.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liblttng-ust-jul-jni.so.0
+%attr(755,root,root) %{_libdir}/liblttng-ust-jul-jni.so
 %{_javadir}/liblttng-ust-java.jar
+%{_javadir}/liblttng-ust-jul.jar
 %endif