← Back to branch summary

~lttng/lttng-ust/packaging-daily

« back to all changes in this revision

Viewing changes to patches/fix-incompatible-java-bytecode-format.patch

  • Committer: Simon Marchi
  • Date: 2016-02-15 12:24:47 UTC
  • Revision ID: simon.marchi@polymtl.ca-20160215122447-bytwba7f3b0wfxd0
Refresh patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/fix-incompatible-java-bytecode-format.patch
1
 
diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am b/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am
2
 
index 26606b6..5bcf73e 100644
3
1
--- a/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am
4
2
+++ b/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am
5
3
@@ -1,4 +1,5 @@
8
6
 
9
7
 pkgpath = org/lttng/ust/agent
10
8
 
11
 
diff --git a/liblttng-ust-java-agent/jni/jul/Makefile.am b/liblttng-ust-java-agent/jni/jul/Makefile.am
12
 
index 40906e1..19f4291 100644
13
9
--- a/liblttng-ust-java-agent/jni/jul/Makefile.am
14
10
+++ b/liblttng-ust-java-agent/jni/jul/Makefile.am
15
11
@@ -1,6 +1,7 @@
21
17
 liblttng_ust_jul_jni_la_SOURCES = lttng_ust_jul.c \
22
18
                                  lttng_ust_jul.h
23
19
 
24
 
diff --git a/liblttng-ust-java-agent/jni/log4j/Makefile.am b/liblttng-ust-java-agent/jni/log4j/Makefile.am
25
 
index 07384f8..ad7a179 100644
26
20
--- a/liblttng-ust-java-agent/jni/log4j/Makefile.am
27
21
+++ b/liblttng-ust-java-agent/jni/log4j/Makefile.am
28
 
@@ -1,5 +1,6 @@
 
22
@@ -1,6 +1,8 @@
29
23
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
 
24
 
30
25
-lib_LTLIBRARIES = liblttng-ust-log4j-jni.la
31
26
+jnilib_LTLIBRARIES = liblttng-ust-log4j-jni.la
32
27
+jnilibdir = $(libdir)/jni
 
28
+
33
29
 liblttng_ust_log4j_jni_la_SOURCES = lttng_ust_log4j.c \
34
30
                                  lttng_ust_log4j.h
35
31
 
36
 
diff --git a/liblttng-ust-java/Makefile.am b/liblttng-ust-java/Makefile.am
37
 
index baada57..1cd1da4 100644
38
32
--- a/liblttng-ust-java/Makefile.am
39
33
+++ b/liblttng-ust-java/Makefile.am
40
34
@@ -1,4 +1,5 @@
43
37
 jarfile = liblttng-ust-java.jar
44
38
 jardir = $(datadir)/java
45
39
 pkgpath = org/lttng/ust
46
 
@@ -8,7 +9,8 @@ jar_DATA = $(jarfile)
 
40
@@ -8,7 +9,8 @@
47
41
 BUILT_SOURCES = org_lttng_ust_LTTngUst.h
48
42
 
49
43
 AM_CPPFLAGS = -I$(top_srcdir)/include