|
0 |
Description: Fixes the build failure with Java 10
|
|
1 |
Author: Emmanuel Bourg <ebourg@apache.org>
|
|
2 |
Forwarded: no
|
|
3 |
--- a/configure.in
|
|
4 |
+++ b/configure.in
|
|
5 |
@@ -211,13 +211,6 @@
|
|
6 |
fi
|
|
7 |
AC_SUBST(JAVAC)
|
|
8 |
|
|
9 |
-dnl Determine if we have the Java header file generator
|
|
10 |
-AC_PATH_PROG(JAVAH, javah, not_found)
|
|
11 |
-if test ${JAVAH} = not_found; then
|
|
12 |
- AC_MSG_ERROR('No Java header generator (javah) found')
|
|
13 |
-fi
|
|
14 |
-AC_SUBST(JAVAH)
|
|
15 |
-
|
|
16 |
dnl Determine if we have jar
|
|
17 |
AC_PATH_PROG(JAR, jar, not_found)
|
|
18 |
if test ${JAR} = not_found; then
|
|
19 |
--- a/Make.rules
|
|
20 |
+++ b/Make.rules
|
|
21 |
@@ -71,6 +71,7 @@
|
|
22 |
$(JAVA_PACKAGE_DIR)/%.class: %.java
|
|
23 |
@-mkdir -p $(dir $@)
|
|
24 |
$(JAVAC) $(JFLAGS) -d $(JAVA_CLASSES_DIR) \
|
|
25 |
+ -h $(PACKAGE_GENERATED_DIR) \
|
|
26 |
-sourcepath $(JAVA_SRC_DIR) \
|
|
27 |
-classpath $(JAVA_CLASS_PATH) $<
|
|
28 |
|
|
29 |
@@ -120,11 +121,6 @@
|
|
30 |
# Rule to make header files from java class files.
|
|
31 |
# The originating java source must contain native method specifications.
|
|
32 |
$(PACKAGE_GENERATED_DIR)/$(JNI_HEADER_PREFIX)_%.h: $(JAVA_PACKAGE_DIR)/%.class
|
|
33 |
- @-rm $@ > /dev/null 2>&1
|
|
34 |
- @-mkdir -p $(dir $@)
|
|
35 |
- "$(JAVAH)" -d $(PACKAGE_GENERATED_DIR) -jni \
|
|
36 |
- -classpath $(JAVA_CLASS_PATH) \
|
|
37 |
- $(JAVA_PACKAGE).$(subst .class,,$(notdir $<))
|
|
38 |
|
|
39 |
# Rule to compile JNI C files
|
|
40 |
$(PACKAGE_OBJ_DIR)/%.lo: %.c $(PACKAGE_GENERATED_DIR)/%.h
|