svn commit: r564085 - in head/java/openjdk14: . files
Jung-uk Kim
jkim at FreeBSD.org
Fri Feb 5 04:06:56 UTC 2021
Author: jkim
Date: Fri Feb 5 04:06:54 2021
New Revision: 564085
URL: https://svnweb.freebsd.org/changeset/ports/564085
Log:
Fix build with Clang 11.
https://github.com/battleblow/jdk14u/commit/11c638e62d57229828810b7fbdd1bb143808d5a3
https://github.com/battleblow/jdk14u/commit/a01e80aa36522ce709ee301afac057f649a1c472
https://github.com/battleblow/jdk14u/commit/0874ad9af5058d3dc9381e7d80745b8a3b1c5b6d
PR: 250270
Added:
head/java/openjdk14/files/patch-changeset-57932 (contents, props changed)
head/java/openjdk14/files/patch-changeset-57994 (contents, props changed)
head/java/openjdk14/files/patch-src_java.desktop_unix_classes_sun_awt_X11_XlibWrapper.java (contents, props changed)
head/java/openjdk14/files/patch-src_java.desktop_unix_native_libawt__xawt_xawt_XlibWrapper.c (contents, props changed)
Modified:
head/java/openjdk14/Makefile
Modified: head/java/openjdk14/Makefile
==============================================================================
--- head/java/openjdk14/Makefile Fri Feb 5 04:04:53 2021 (r564084)
+++ head/java/openjdk14/Makefile Fri Feb 5 04:06:54 2021 (r564085)
@@ -3,6 +3,7 @@
PORTNAME= openjdk
DISTVERSIONPREFIX= jdk-
DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
+PORTREVISION= 1
CATEGORIES= java devel
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
Added: head/java/openjdk14/files/patch-changeset-57932
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/java/openjdk14/files/patch-changeset-57932 Fri Feb 5 04:06:54 2021 (r564085)
@@ -0,0 +1,44 @@
+changeset: 57932:9e54ea7d9cd9
+user: qpzhang
+date: Wed Feb 05 20:31:09 2020 +0800
+summary: 8238388: libj2gss/NativeFunc.o "multiple definition" link errors with GCC10
+
+diff -r 932418820c80 -r 9e54ea7d9cd9 src/java.security.jgss/share/native/libj2gss/NativeFunc.c
+--- src/java.security.jgss/share/native/libj2gss/NativeFunc.c Wed Feb 05 10:45:39 2020 +0100
++++ src/java.security.jgss/share/native/libj2gss/NativeFunc.c Wed Feb 05 20:31:09 2020 +0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -27,6 +27,9 @@
+ #include <stdlib.h>
+ #include "NativeFunc.h"
+
++/* global GSS function table */
++GSS_FUNCTION_TABLE_PTR ftab;
++
+ /* standard GSS method names (ordering is from mapfile) */
+ static const char RELEASE_NAME[] = "gss_release_name";
+ static const char IMPORT_NAME[] = "gss_import_name";
+diff -r 932418820c80 -r 9e54ea7d9cd9 src/java.security.jgss/share/native/libj2gss/NativeFunc.h
+--- src/java.security.jgss/share/native/libj2gss/NativeFunc.h Wed Feb 05 10:45:39 2020 +0100
++++ src/java.security.jgss/share/native/libj2gss/NativeFunc.h Wed Feb 05 20:31:09 2020 +0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -277,6 +277,6 @@
+ typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR;
+
+ /* global GSS function table */
+-GSS_FUNCTION_TABLE_PTR ftab;
++extern GSS_FUNCTION_TABLE_PTR ftab;
+
+ #endif
+
Added: head/java/openjdk14/files/patch-changeset-57994
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/java/openjdk14/files/patch-changeset-57994 Fri Feb 5 04:06:54 2021 (r564085)
@@ -0,0 +1,43 @@
+changeset: 57994:6925fca95959
+user: qpzhang
+date: Tue Feb 04 21:27:10 2020 +0800
+summary: 8238380: java.base/unix/native/libjava/childproc.c "multiple definition" link errors with GCC10
+
+diff -r 8f6ffa575f63 -r 6925fca95959 src/java.base/unix/native/libjava/childproc.c
+--- src/java.base/unix/native/libjava/childproc.c Tue Feb 11 11:17:37 2020 +0800
++++ src/java.base/unix/native/libjava/childproc.c Tue Feb 04 21:27:10 2020 +0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -34,6 +34,7 @@
+
+ #include "childproc.h"
+
++const char * const *parentPathv;
+
+ ssize_t
+ restartableWrite(int fd, const void *buf, size_t count)
+diff -r 8f6ffa575f63 -r 6925fca95959 src/java.base/unix/native/libjava/childproc.h
+--- src/java.base/unix/native/libjava/childproc.h Tue Feb 11 11:17:37 2020 +0800
++++ src/java.base/unix/native/libjava/childproc.h Tue Feb 04 21:27:10 2020 +0800
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -126,7 +126,7 @@
+ * The cached and split version of the JDK's effective PATH.
+ * (We don't support putenv("PATH=...") in native code)
+ */
+-const char * const *parentPathv;
++extern const char * const *parentPathv;
+
+ ssize_t restartableWrite(int fd, const void *buf, size_t count);
+ int restartableDup2(int fd_from, int fd_to);
+
Added: head/java/openjdk14/files/patch-src_java.desktop_unix_classes_sun_awt_X11_XlibWrapper.java
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/java/openjdk14/files/patch-src_java.desktop_unix_classes_sun_awt_X11_XlibWrapper.java Fri Feb 5 04:06:54 2021 (r564085)
@@ -0,0 +1,11 @@
+--- src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java.orig 2020-04-17 22:35:42 UTC
++++ src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java
+@@ -529,7 +529,7 @@ static native String XSetLocaleModifiers(String modifi
+ display Specifies the connection to the X server.
+ onoff Specifies a Boolean value that indicates whether to enable or disable synchronization.
+ */
+- static native int XSynchronize(long display, boolean onoff);
++ static native long XSynchronize(long display, boolean onoff);
+
+ /**
+ * Extracts an X event that can be processed in a secondary loop.
Added: head/java/openjdk14/files/patch-src_java.desktop_unix_native_libawt__xawt_xawt_XlibWrapper.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/java/openjdk14/files/patch-src_java.desktop_unix_native_libawt__xawt_xawt_XlibWrapper.c Fri Feb 5 04:06:54 2021 (r564085)
@@ -0,0 +1,15 @@
+--- src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c.orig 2020-04-17 22:35:42 UTC
++++ src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c
+@@ -2180,10 +2180,10 @@ Java_sun_awt_X11_XlibWrapper_copyLongArray(JNIEnv *env
+ }
+ }
+
+-JNIEXPORT jint JNICALL
++JNIEXPORT jlong JNICALL
+ Java_sun_awt_X11_XlibWrapper_XSynchronize(JNIEnv *env, jclass clazz, jlong display, jboolean onoff)
+ {
+- return (jint) XSynchronize((Display*)jlong_to_ptr(display), (onoff == JNI_TRUE ? True : False));
++ return ptr_to_jlong(XSynchronize((Display*)jlong_to_ptr(display), (onoff == JNI_TRUE ? True : False)));
+ }
+
+ JNIEXPORT jboolean JNICALL
More information about the svn-ports-all
mailing list