- rediffed/updated patches

diff --git a/lttng-ust-java.patch b/lttng-ust-java.patch
index 671b775798f2de3fc96359823982a58612c06407..eee729c1420b39313bbaece6faa6873acf856470 100644 (file)
--- a/lttng-ust-java.patch
+++ b/lttng-ust-java.patch
@@ -1,11 +1,11 @@
---- lttng-ust-2.6.0/liblttng-ust-java/Makefile.am.orig 2015-01-27 16:26:04.867994970 +0100
-+++ lttng-ust-2.6.0/liblttng-ust-java/Makefile.am      2015-01-27 17:05:53.134561412 +0100
-@@ -19,7 +19,7 @@
- 
+--- 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 @@
+ else
  org_lttng_ust_LTTngUst.h: jni-header.stamp
  
 -jni-header.stamp: $(dist_noinst_JAVA)
 +jni-header.stamp: classnoinst.stamp
        $(JAVAH) -classpath $(srcdir) $(JAVAHFLAGS) org.lttng.ust.LTTngUst && \
        echo "JNI header generated" > jni-header.stamp
- 
+ endif

diff --git a/lttng-ust-link.patch b/lttng-ust-link.patch
index 8321940371fa62b3448c60952546d98ef379e46d..b8a57cca6a454428f84f7d3701a93470ee79f1e3 100644 (file)
--- a/lttng-ust-link.patch
+++ b/lttng-ust-link.patch
@@ -1,21 +1,3 @@
---- 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 = \
-+      -ldl \
-       -lpthread \
-       -lrt \
-       -lurcu-cds \
 --- 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 @@
@@ -59,10 +41,10 @@
  
 -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
+--- 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
+ 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 \