]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
pass '-classpath' option (gcj/javah ignores CLASSPATH environment variable).
authorDmitry Smirnov <onlyjob@member.fsf.org>
Mon, 12 May 2014 04:02:53 +0000 (14:02 +1000)
committerSage Weil <sage@inktank.com>
Tue, 20 May 2014 22:22:05 +0000 (15:22 -0700)
commit9e335a494c6eff209cff64bd663b5aa2a7bbc242
tree24fb8ae664633114640e27527027a5598a213d3f
parentfcd30500790eac0266ffb70d83ee17b23aeaf209
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<const jbyte*>(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 <onlyjob@member.fsf.org>
(cherry picked from commit 89fe0353582bde7e2fbf32f1626d430a20002dd0)
src/java/Makefile.am