Fix: build jni libs with openjdk >= 10
A message that is not in the archive (sent off-list or not yet received): [email protected]
Mathieu Desnoyers
AppliedMerged into master, 2.10, 2.9, thanks!
Mathieu
Quoted 135 lines · ----- On May 3, 2018, at 3:42 PM, Michael Jeanson [email protected] wrote:
In openjdk 10, the "javah" utility used to generate c headers from java classes was removed and replaced with an option of "javac".
When we detect "javac" but no "javah", assume we are working with openjdk >= 10 and configure the build system to use the proper tool and switches.
Signed-off-by Michael Jeanson <[email protected]>---
configure.ac | 2 ++ .../java/lttng-ust-agent-common/Makefile.am | 6 ++++++ .../java/lttng-ust-agent-jul/Makefile.am | 6 ++++++ .../java/lttng-ust-agent-log4j/Makefile.am | 6 ++++++ liblttng-ust-java/Makefile.am | 8 ++++++++ 5 files changed, 28 insertions(+)configure.ac +0
-0@@ -371,6 +371,8 @@ AS_IF([test "x$jni_interface" = "xyes" || test"x$java_agent_jul" = "xyes" || te
CPPFLAGS="$CPPFLAGS $JNI_CPPFLAGS"
AX_PROG_JAVAH
CPPFLAGS="$saved_CPPFLAGS"configure.ac +2
-0+ + AM_CONDITIONAL([HAVE_JAVAH], [test "x$JAVAH" != "x"])])
AS_IF([test "x$java_agent_log4j" = "xyes"], [
liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am +0
-0@@ -50,11 +50,17 @@ classes = $(pkgpath)/*.class \$(jarfile): classnoinst.stamp
$(JAR) cfm $(JARFLAGS) $@ $(jarfile_manifest) $(classes) && rm -f $(jarfile_symlink) && $(LN_S) $@ $(jarfile_symlink)liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile.am +5
-0+if !HAVE_JAVAH +# If we don't have javah, assume we are running openjdk >= 10 and use javac +# to generate the jni header file. +AM_JAVACFLAGS = -h $(jnioutdir) +elsecontext-jni-header.stamp: $(dist_noinst_JAVA)
$(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(jnioutdir) $(JAVAHFLAGS) org.lttng.ust.agent.context.LttngContextApi && \ echo "Context API JNI header generated" > context-jni-header.stampall-local: context-jni-header.stamp
+endifinstall-data-hook:
cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink) && $(LN_S) $(jarfile) $(jarfile_symlink)liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am +0
-0@@ -26,11 +26,17 @@ classes = $(pkgpath)/*.class$(jarfile): classnoinst.stamp
$(JAR) cfm $(JARFLAGS) $@ $(jarfile_manifest) $(classes) && rm -f $(jarfile_symlink) && $(LN_S) $@ $(jarfile_symlink)liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile.am +5
-0+if !HAVE_JAVAH +# If we don't have javah, assume we are running openjdk >= 10 and use javac +# to generate the jni header file. +AM_JAVACFLAGS = -h $(juljniout) +elsejul-jni-header.stamp: $(dist_noinst_JAVA)
$(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(juljniout) $(JAVAHFLAGS) org.lttng.ust.agent.jul.LttngJulApi && \ echo "JUL JNI header generated" > jul-jni-header.stampall-local: $(stamp)
+endifinstall-data-hook:
cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink) && $(LN_S) $(jarfile) $(jarfile_symlink)liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am +0
-0@@ -26,11 +26,17 @@ classes = $(pkgpath)/*.class$(jarfile): classnoinst.stamp
$(JAR) cfm $(JARFLAGS) $@ $(jarfile_manifest) $(classes) && rm -f $(jarfile_symlink) && $(LN_S) $@ $(jarfile_symlink)liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am +5
-0+if !HAVE_JAVAH +# If we don't have javah, assume we are running openjdk >= 10 and use javac +# to generate the jni header file. +AM_JAVACFLAGS = -h $(log4jjniout) +elselog4j-jni-header.stamp: $(dist_noinst_JAVA)
$(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(log4jjniout) $(JAVAHFLAGS) org.lttng.ust.agent.log4j.LttngLog4jApi && \ echo "Log4j JNI header generated" > log4j-jni-header.stampall-local: $(stamp)
+endifinstall-data-hook:
cd $(DESTDIR)/$(jardir) && rm -f $(jarfile_symlink) && $(LN_S) $(jarfile) $(jarfile_symlink)liblttng-ust-java/Makefile.am +0
-1@@ -17,11 +17,19 @@ liblttng_ust_java_la_LIBADD = -lc -L$(top_builddir)/liblttng-ust/.libs -llttng-u$(jarfile): classnoinst.stamp
$(JAR) cf $(JARFLAGS) $@ $(pkgpath)/*.classliblttng-ust-java/Makefile.am +7
-0+if !HAVE_JAVAH +# If we don't have javah, assume we are running openjdk >= 10 and use javac +# to generate the jni header file. +AM_JAVACFLAGS = -h . + +org_lttng_ust_LTTngUst.h: $(jarfile) +else
org_lttng_ust_LTTngUst.h: jni-header.stampjni-header.stamp: $(dist_noinst_JAVA)
$(JAVAH) -classpath $(srcdir) $(JAVAHFLAGS) org.lttng.ust.LTTngUst && \ echo "JNI header generated" > jni-header.stamp+endif
all-local:
org_lttng_ust_LTTngUst.h--
2.17.0
Signature · 7 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev