Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

jewel: makefile: use javac for creating JNI headers #22166

Merged
merged 2 commits into from May 23, 2018
Merged

jewel: makefile: use javac for creating JNI headers #22166

merged 2 commits into from May 23, 2018

Conversation

tchaikov
Copy link
Contributor

@tchaikov tchaikov commented May 23, 2018 •
edited

backport of #21822

@tchaikov tchaikov added this to the jewel milestone May 23, 2018
@tchaikov tchaikov requested review from yuriw and theanalyst May 23, 2018 02:53
yuriw
yuriw approved these changes May 23, 2018
View reviewed changes
Copy link
Contributor

@yuriw yuriw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@tchaikov tchaikov force-pushed the jewel-javah branch 2 times, most recently from 170cb44 to bfaa5aa Compare May 23, 2018 06:22
@tchaikov
makefile: use javac for creating JNI headers
c029d2d 
JDK 1.10 does not offer javah anymore, so we need to use "javac -h"
instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit edc504b)
Conflicts: configure.ac:
           src/java/Makefile.am: we don't use cmake back in jewel, so
port the cmake changes to autotools.
@tchaikov
makefile: bump java source option from 5 to 6
0598cd0 
this kills the errors like

error: Source option 5 is no longer supported. Use 6 or later.
error: Target option 1.5 is no longer supported. Use 1.6 or later.

Signed-off-by: Kefu Chai <kchai@redhat.com>
Conflicts:
    src/java/Makefile.am: this change is not cherry-picked from
master. as we've moved to java 8 in master. see df27ed3 .
@tchaikov
Copy link
Contributor Author

being built at https://shaman.ceph.com/builds/ceph/jewel-javah-kefu/

@tchaikov tchaikov merged commit 36bdee4 into ceph:jewel May 23, 2018
@tchaikov tchaikov deleted the jewel-javah branch May 23, 2018 09:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yuriw yuriw yuriw approved these changes

@theanalyst theanalyst Awaiting requested review from theanalyst

Assignees
No one assigned
Labels
build/ops
Projects
None yet
Milestone
jewel
2 participants
@tchaikov @yuriw