84 lines
3.2 KiB
Diff
84 lines
3.2 KiB
Diff
diff -urEbwB techblue-jmagick-586c8bb.orig/configure.ac techblue-jmagick-586c8bb/configure.ac
|
|
--- techblue-jmagick-586c8bb.orig/configure.ac 2022-05-10 07:29:48.353118826 +0200
|
|
+++ techblue-jmagick-586c8bb/configure.ac 2022-05-10 07:37:33.603876857 +0200
|
|
@@ -230,13 +230,6 @@
|
|
fi
|
|
AC_SUBST(JAVAC)
|
|
|
|
-dnl Determine if we have the Java header file generator
|
|
-AC_PATH_PROG(JAVAH, javah, not_found)
|
|
-if test ${JAVAH} = not_found; then
|
|
- AC_MSG_ERROR('No Java header generator (javah) found')
|
|
-fi
|
|
-AC_SUBST(JAVAH)
|
|
-
|
|
dnl Determine if we have jar
|
|
AC_PATH_PROG(JAR, jar, not_found)
|
|
if test ${JAR} = not_found; then
|
|
diff -urEbwB techblue-jmagick-586c8bb.orig/Make.def.in techblue-jmagick-586c8bb/Make.def.in
|
|
--- techblue-jmagick-586c8bb.orig/Make.def.in 2022-05-10 07:29:48.353118826 +0200
|
|
+++ techblue-jmagick-586c8bb/Make.def.in 2022-05-10 07:31:43.145799326 +0200
|
|
@@ -36,9 +36,6 @@
|
|
# The Java compiler to use.
|
|
JAVAC = @JAVAC@
|
|
|
|
-# The Java header file generator.
|
|
-JAVAH = @JAVAH@
|
|
-
|
|
# The Java archive maintainer
|
|
JAR = @JAR@
|
|
|
|
diff -urEbwB techblue-jmagick-586c8bb.orig/Makefile techblue-jmagick-586c8bb/Makefile
|
|
--- techblue-jmagick-586c8bb.orig/Makefile 2022-05-10 07:29:48.353118826 +0200
|
|
+++ techblue-jmagick-586c8bb/Makefile 2022-05-10 07:47:38.059454394 +0200
|
|
@@ -47,7 +47,7 @@
|
|
@-if [ -x "$(JAVADOC)" ]; then \
|
|
echo Generating Javadoc files ... ; \
|
|
$(INSTALL) -d $(DESTDIR)$(JAVADOC_DIR) ; \
|
|
- "$(JAVADOC)" -author -version -d $(JAVADOC_DEST) \
|
|
+ "$(JAVADOC)" -notimestamp -source 8 -author -version -d $(JAVADOC_DEST) \
|
|
-sourcepath $(JAVADOC_SRC) magick magick.util ; \
|
|
else \
|
|
echo Unable to generate javadoc; \
|
|
diff -urEbwB techblue-jmagick-586c8bb.orig/Make.rules techblue-jmagick-586c8bb/Make.rules
|
|
--- techblue-jmagick-586c8bb.orig/Make.rules 2022-05-10 07:29:48.353118826 +0200
|
|
+++ techblue-jmagick-586c8bb/Make.rules 2022-05-10 07:39:55.740706118 +0200
|
|
@@ -47,11 +47,6 @@
|
|
JAVAC = javac
|
|
endif
|
|
|
|
-# Define the Java header generator
|
|
-ifndef JAVAH
|
|
-JAVAH = javah
|
|
-endif
|
|
-
|
|
# Define where libtool is
|
|
ifndef LIBTOOL
|
|
top_builddir = $(PROJ_BASE_DIR)
|
|
@@ -88,7 +83,7 @@
|
|
# The rule to make class files from java files.
|
|
$(JAVA_PACKAGE_DIR)/%.class: %.java
|
|
@-mkdir -p $(dir $@)
|
|
- $(JAVAC) $(JFLAGS) -d $(JAVA_CLASSES_PATH) \
|
|
+ $(JAVAC) $(JFLAGS) -source 8 -target 8 -d $(JAVA_CLASSES_PATH) -h $(PACKAGE_GENERATED_OUTPUT_DIR) \
|
|
-sourcepath $(JAVA_SRC_PATH) \
|
|
-classpath $(JAVA_CLASS_PATH) $<
|
|
|
|
@@ -141,12 +136,11 @@
|
|
# The rule to make JNI header files from java files.
|
|
# Rule to make header files from java class files.
|
|
# The originating java source must contain native method specifications.
|
|
-$(PACKAGE_GENERATED_INPUT_DIR)/$(JNI_HEADER_PREFIX)_%.h: $(JAVA_PACKAGE_DIR)/%.class
|
|
- @-rm $@ > /dev/null 2>&1
|
|
+$(PACKAGE_GENERATED_INPUT_DIR)/$(JNI_HEADER_PREFIX)_%.h: %.java
|
|
@-mkdir -p $(dir $@)
|
|
- "$(JAVAH)" -d $(PACKAGE_GENERATED_OUTPUT_DIR) -jni \
|
|
- -classpath $(JAVA_CLASS_PATH) \
|
|
- $(JAVA_PACKAGE).$(subst .class,,$(notdir $<))
|
|
+ $(JAVAC) $(JFLAGS) -source 8 -target 8 -d $(JAVA_CLASSES_PATH) -h $(PACKAGE_GENERATED_OUTPUT_DIR) \
|
|
+ -sourcepath $(JAVA_SRC_PATH) \
|
|
+ -classpath $(JAVA_CLASS_PATH) $<
|
|
|
|
# Rule to compile JNI C files
|
|
$(PACKAGE_OBJ_DIR)/%.lo: %.c $(PACKAGE_GENERATED_INPUT_DIR)/%.h
|