Index | Thread | Search

From:
"Sebastian Reitenbach" <sebastia@l00-bugdead-prods.de>
Subject:
fix building java when jni.h is included
To:
kurt@openbsd.org, ports@openbsd.org
Date:
Sat, 24 Feb 2024 22:56:10 +0100

Download raw body.

Thread
  • Sebastian Reitenbach:

    fix building java when jni.h is included

Hi,

in jni.h, jni_md.h is included. However, this file is installed in openbsd/jni_md.h
The patch below is for jdk-11, but I saw, that jdk-1.8 has the same issue.
Don't know if that patch is the most sane approach, or if there are better ways
to fix the issue.

Sebastian


Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/jdk/11/Makefile,v
diff -u -r1.55 Makefile
--- Makefile	22 Nov 2023 23:38:04 -0000	1.55
+++ Makefile	24 Feb 2024 21:44:38 -0000
@@ -12,7 +12,7 @@
 PKGNAME=	jdk-${PACKAGE_VER}
 PKGSTEM=	jdk-11
 EPOCH=		0
-REVISION=	0
+REVISION=	1
 
 DIST_SUBDIR=	jdk
 DISTNAME=	jdk-${VERSION_STR}
Index: patches/patch-src_java_base_share_native_include_jni_h
===================================================================
RCS file: patches/patch-src_java_base_share_native_include_jni_h
diff -N patches/patch-src_java_base_share_native_include_jni_h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_java_base_share_native_include_jni_h	24 Feb 2024 21:44:38 -0000
@@ -0,0 +1,13 @@
+Let it properly find jni_md.h
+Index: src/java.base/share/native/include/jni.h
+--- src/java.base/share/native/include/jni.h.orig
++++ src/java.base/share/native/include/jni.h
+@@ -42,7 +42,7 @@
+ /* jni_md.h contains the machine-dependent typedefs for jbyte, jint
+    and jlong */
+ 
+-#include "jni_md.h"
++#include "openbsd/jni_md.h"
+ 
+ #ifdef __cplusplus
+ extern "C" {