Update to use jdk-11:
* Set the jdk version to 11 only and adjust startup scripts so that
java does not need to be in the path to run.
Tested on sparc64, amd64, aarch64, i386. Regress tests ok
on aarch64 and amd64; Fail on i386 (but did with 1.8 too) and
sparc64.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/kawa/Makefile,v
diff -u -p -u -r1.25 Makefile
--- Makefile 26 Sep 2023 12:02:02 -0000 1.25
+++ Makefile 27 Dec 2025 14:44:24 -0000
@@ -2,7 +2,7 @@ COMMENT= Scheme and language framework
DISTNAME= kawa-3.1.1
CATEGORIES= lang java
-REVISION= 1
+REVISION= 2
HOMEPAGE= https://www.gnu.org/software/kawa/
@@ -12,7 +12,7 @@ PERMIT_PACKAGE= Yes
SITES= ${SITE_GNU:=kawa/}
MODULES= java
-MODJAVA_VER= 1.8+
+MODJAVA_VER= 11
TEST_DEPENDS= ${RUN_DEPENDS}
@@ -27,7 +27,8 @@ BUILD_DEPENDS= print/texinfo \
${MODGNU_AUTOMAKE_DEPENDS}
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --enable-kawa-frontend
+CONFIGURE_ARGS+= --enable-kawa-frontend \
+ --with-java-source=11
CONFIGURE_ENV+= AUTOMAKE=${LOCALBASE}/bin/automake-1.16 \
AUTOCONF=${LOCALBASE}/bin/autoconf-2.69
@@ -37,12 +38,14 @@ MAKE_FLAGS= JAVAC=${JAVA_HOME}/bin/java
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
-MAKE_ENV+= SLIB_JAVAFLAGS=-Xmx1200M
+#MAKE_ENV+= SLIB_JAVAFLAGS=-Xmx1200M
# use UTF-8 encoding to avoid following errors:
# unmappable character for encoding ASCII
MAKE_ENV+= LANG=en_US.UTF-8
+SUBST_VARS+= JAVA_HOME
+
TEST_FLAGS = DIFF=diff \
PATH=${PATH}:${JAVA_HOME}/bin
@@ -53,5 +56,8 @@ pre-patch:
xargs sed -i 's,^JAR =.*,JAR = ${JAVA_HOME}/bin/jar,g'; \
touch ${WRKSRC}/configure.ac
sed -i 's,/usr/bin,${LOCALBASE}/bin,g' ${WRKDIST}/doc/*.man
+
+post-patch:
+ ${SUBST_CMD} ${WRKSRC}/bin/kawa.c
.include <bsd.port.mk>
Index: patches/patch-bin_kawa_c
===================================================================
RCS file: patches/patch-bin_kawa_c
diff -N patches/patch-bin_kawa_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-bin_kawa_c 27 Dec 2025 14:44:24 -0000
@@ -0,0 +1,14 @@
+Run without java in path.
+
+Index: bin/kawa.c
+--- bin/kawa.c.orig
++++ bin/kawa.c
+@@ -517,7 +517,7 @@ main(int argc, char** argv)
+ out_argv[out_argc++] = get_command (argv[0]);
+ #else
+ putenv (get_classpath(argv[0]));
+- out_argv[out_argc++] = "java";
++ out_argv[out_argc++] = "${JAVA_HOME}/bin/java";
+
No comments:
Post a Comment