From 89fe0353582bde7e2fbf32f1626d430a20002dd0 Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Mon, 12 May 2014 14:02:53 +1000 Subject: [PATCH] pass '-classpath' option (gcj/javah ignores CLASSPATH environment variable). This should not affect OpenJDK which understands '-classpath' as well. With gcj-jdk we still get FTBFS later: ~~~~ java/native/libcephfs_jni.cc:2878:55: error: invalid conversion from 'const jbyte* {aka const signed char*}' to 'jbyte* {aka signed char*}' [-fpermissive] reinterpret_cast(rawAddress)); ^ In file included from java/native/libcephfs_jni.cc:27:0: /usr/lib/gcc/x86_64-linux-gnu/4.8/include/jni.h:1471:8: error: initializing argument 4 of 'void _Jv_JNIEnv::SetByteArrayRegion(jbyteArray, jsize, jsize, jbyte*)' [-fpermissive] void SetByteArrayRegion (jbyteArray val0, jsize val1, jsize val2, jbyte * val3) ^ make[5] *** [java/native/libcephfs_jni_la-libcephfs_jni.lo] Error 1 ~~~~ Signed-off-by: Dmitry Smirnov --- src/java/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/Makefile.am b/src/java/Makefile.am index 8b28f839e464f..4b3d1fb751bc3 100644 --- a/src/java/Makefile.am +++ b/src/java/Makefile.am @@ -44,11 +44,11 @@ CEPH_PROXY=java/com/ceph/fs/CephMount.class $(CEPH_PROXY): $(JAVA_SRC) export CLASSPATH=java/ ; \ - $(JAVAC) -source 1.5 -target 1.5 -Xlint:-options java/com/ceph/fs/*.java + $(JAVAC) -classpath java -source 1.5 -target 1.5 -Xlint:-options java/com/ceph/fs/*.java $(JAVA_H): $(CEPH_PROXY) export CLASSPATH=java/ ; \ - $(JAVAH) -jni -o $@ com.ceph.fs.CephMount + $(JAVAH) -classpath java -jni -o $@ com.ceph.fs.CephMount libcephfs.jar: $(CEPH_PROXY) $(JAR) cf $@ $(JAVA_CLASSES:%=-C java %) -- 2.39.5