]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
cmake: use javac -h for creating JNI native headers 21872/head
authorKefu Chai <kchai@redhat.com>
Fri, 4 May 2018 14:32:35 +0000 (22:32 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 8 May 2018 11:56:53 +0000 (19:56 +0800)
commit1f1c7eddd490ccae43daa43d98a834bd839fa2cf
tree294cb61da980aa03b64410aadae5215a64b76b6d
parent83d310c320a0987465a0b83247c1085590f443bf
cmake: use javac -h for creating JNI native headers

JDK 1.10 does not offer javah anymore, so we need to use "javac -h" or
add_jar(... GENERATE_NATIVE_HEADERS) instead.

Fixes: http://tracker.ceph.com/issues/24012
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit edc504b9d446cc1739f3e8e087914cfe66d6cac3)

Conflicts:
src/java/CMakeLists.txt: in master, we dropped the support for
trusty, but luminous still supports trusty. while trusty ships JDK-7,
where javac does not support "-h" option yet. so we need to handle this
case. "-h" was introduced in Java SE 8, see
https://docs.oracle.com/javase/8/docs/technotes/guides/javac/index.html
.
src/java/CMakeLists.txt