← 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: Michael Jeanson
  • Date: 2015-11-30 21:22:00 UTC
  • Revision ID: mjeanson@ubuntu.com-20151130212200-h9jmseqhstq8hl59
Sync with upstream debian packaging

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/fix-incompatible-java-bytecode-format.patch
 
1
--- a/liblttng-ust-java/Makefile.am
 
2
+++ b/liblttng-ust-java/Makefile.am
 
3
@@ -1,4 +1,5 @@
 
4
 JAVAROOT = .
 
5
+AM_JAVACFLAGS = -source 1.6 -target 1.6
 
6
 jarfile = liblttng-ust-java.jar
 
7
 jardir = $(datadir)/java
 
8
 pkgpath = org/lttng/ust
 
9
@@ -8,7 +9,8 @@
 
10
 BUILT_SOURCES = org_lttng_ust_LTTngUst.h
 
11
 
 
12
 AM_CPPFLAGS = -I$(top_srcdir)/include
 
13
-lib_LTLIBRARIES = liblttng-ust-java.la
 
14
+jnilib_LTLIBRARIES = liblttng-ust-java.la
 
15
+jnilibdir = $(libdir)/jni
 
16
 liblttng_ust_java_la_SOURCES = LTTngUst.c lttng_ust_java.h
 
17
 nodist_liblttng_ust_java_la_SOURCES = org_lttng_ust_LTTngUst.h
 
18
 
 
19
--- a/liblttng-ust-java-agent/jni/jul/Makefile.am
 
20
+++ b/liblttng-ust-java-agent/jni/jul/Makefile.am
 
21
@@ -1,6 +1,7 @@
 
22
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
 
23
 
 
24
-lib_LTLIBRARIES = liblttng-ust-jul-jni.la
 
25
+jnilib_LTLIBRARIES = liblttng-ust-jul-jni.la
 
26
+jnilibdir = $(libdir)/jni
 
27
 liblttng_ust_jul_jni_la_SOURCES = lttng_ust_jul.c \
 
28
                                  lttng_ust_jul.h
 
29
 
 
30
--- a/liblttng-ust-java-agent/jni/log4j/Makefile.am
 
31
+++ b/liblttng-ust-java-agent/jni/log4j/Makefile.am
 
32
@@ -1,5 +1,6 @@
 
33
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
 
34
-lib_LTLIBRARIES = liblttng-ust-log4j-jni.la
 
35
+jnilib_LTLIBRARIES = liblttng-ust-log4j-jni.la
 
36
+jnilibdir = $(libdir)/jni
 
37
 liblttng_ust_log4j_jni_la_SOURCES = lttng_ust_log4j.c \
 
38
                                  lttng_ust_log4j.h
 
39
 
 
40
--- a/liblttng-ust-java-agent/java/Makefile.am
 
41
+++ b/liblttng-ust-java-agent/java/Makefile.am
 
42
@@ -1,4 +1,5 @@
 
43
 JAVAROOT = .
 
44
+AM_JAVACFLAGS = -source 1.6 -target 1.6
 
45
 
 
46
 pkgpath = org/lttng/ust/agent
 
47
 pkgpath_old = org/lttng/ust/jul