Commit f81465e0 authored by Michael Jeanson's avatar Michael Jeanson

Drop patch forcing obsolete java bytecode version 1.6

parent 67984804
......@@ -3,13 +3,7 @@ Author: Michael Jeanson <mjeanson@ubuntu.com>
--- a/liblttng-ust-java/Makefile.am
+++ b/liblttng-ust-java/Makefile.am
@@ -1,4 +1,5 @@
JAVAROOT = .
+AM_JAVACFLAGS = -source 1.6 -target 1.6
jarfile = liblttng-ust-java.jar
jardir = $(datadir)/java
pkgpath = org/lttng/ust
@@ -8,7 +9,8 @@
@@ -8,7 +8,8 @@
BUILT_SOURCES = org_lttng_ust_LTTngUst.h
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(JNI_CPPFLAGS)
......@@ -41,14 +35,6 @@ Author: Michael Jeanson <mjeanson@ubuntu.com>
liblttng_ust_log4j_jni_la_SOURCES = lttng_ust_log4j.c \
lttng_ust_log4j.h
--- a/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am
+++ b/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am
@@ -1,4 +1,5 @@
JAVAROOT = .
+AM_JAVACFLAGS = -source 1.6 -target 1.6
pkgpath = org/lttng/ust/agent
--- a/liblttng-ust-java-agent/jni/common/Makefile.am
+++ b/liblttng-ust-java-agent/jni/common/Makefile.am
@@ -1,6 +1,7 @@
......
fix-incompatible-java-bytecode-format.patch
fix-jni-libdir.patch
use-python3.patch
javah-doesnt-generate-class-files.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment