mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
bump version to 2022.02.9
add miyoo_defconfig
This commit is contained in:
tiopex
@@ -1,119 +0,0 @@
|
||||
From 58911e9de888aece29f491995a8b8a31f7d6b424 Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Zhang <patrick.zhang@amperecomputing.com>
|
||||
Date: Wed, 05 Feb 2020 17:14:15 -0700
|
||||
Subject: [PATCH] fix gcc 10 support
|
||||
|
||||
This patch fixes the "multiple definition" link errors with GCC10 due to
|
||||
GCC10 setting -fno-common by default.
|
||||
|
||||
This is a combination of the following upstream commits:
|
||||
- https://hg.openjdk.java.net/jdk/jdk/rev/8e6fa89397ca
|
||||
- https://hg.openjdk.java.net/jdk/jdk/rev/6925fca95959
|
||||
- https://hg.openjdk.java.net/jdk/jdk/rev/9e54ea7d9cd9
|
||||
|
||||
Signed-off-by: Patrick Zhang <patrick.zhang@amperecomputing.com>
|
||||
Signed-off-by: Adam Duskett <Aduskett@gmail.com>
|
||||
---
|
||||
src/java.base/unix/native/libjava/childproc.c | 1 +
|
||||
src/java.base/unix/native/libjava/childproc.h | 2 +-
|
||||
.../share/native/libj2gss/NativeFunc.c | 3 +++
|
||||
.../share/native/libj2gss/NativeFunc.h | 2 +-
|
||||
src/jdk.sctp/unix/native/libsctp/Sctp.h | 12 ++++++------
|
||||
src/jdk.sctp/unix/native/libsctp/SctpNet.c | 7 +++++++
|
||||
6 files changed, 19 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/src/java.base/unix/native/libjava/childproc.c b/src/java.base/unix/native/libjava/childproc.c
|
||||
index 811aaeac5..16480bfbf 100644
|
||||
--- a/src/java.base/unix/native/libjava/childproc.c
|
||||
+++ b/src/java.base/unix/native/libjava/childproc.c
|
||||
@@ -33,6 +33,7 @@
|
||||
|
||||
#include "childproc.h"
|
||||
|
||||
+const char * const *parentPathv;
|
||||
|
||||
ssize_t
|
||||
restartableWrite(int fd, const void *buf, size_t count)
|
||||
diff --git a/src/java.base/unix/native/libjava/childproc.h b/src/java.base/unix/native/libjava/childproc.h
|
||||
index 091150930..d57e44b6e 100644
|
||||
--- a/src/java.base/unix/native/libjava/childproc.h
|
||||
+++ b/src/java.base/unix/native/libjava/childproc.h
|
||||
@@ -118,7 +118,7 @@ typedef struct _SpawnInfo {
|
||||
* 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);
|
||||
diff --git a/src/java.security.jgss/share/native/libj2gss/NativeFunc.c b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c
|
||||
index da7bc0445..5941f7b5a 100644
|
||||
--- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.c
|
||||
+++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c
|
||||
@@ -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 --git a/src/java.security.jgss/share/native/libj2gss/NativeFunc.h b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h
|
||||
index 82914387c..e4a4981a3 100644
|
||||
--- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.h
|
||||
+++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h
|
||||
@@ -277,6 +277,6 @@ typedef struct GSS_FUNCTION_TABLE {
|
||||
typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR;
|
||||
|
||||
/* global GSS function table */
|
||||
-GSS_FUNCTION_TABLE_PTR ftab;
|
||||
+extern GSS_FUNCTION_TABLE_PTR ftab;
|
||||
|
||||
#endif
|
||||
diff --git a/src/jdk.sctp/unix/native/libsctp/Sctp.h b/src/jdk.sctp/unix/native/libsctp/Sctp.h
|
||||
index cc1367f78..46b07db0a 100644
|
||||
--- a/src/jdk.sctp/unix/native/libsctp/Sctp.h
|
||||
+++ b/src/jdk.sctp/unix/native/libsctp/Sctp.h
|
||||
@@ -322,12 +322,12 @@ typedef int sctp_peeloff_func(int sock, sctp_assoc_t id);
|
||||
|
||||
#endif /* __linux__ */
|
||||
|
||||
-sctp_getladdrs_func* nio_sctp_getladdrs;
|
||||
-sctp_freeladdrs_func* nio_sctp_freeladdrs;
|
||||
-sctp_getpaddrs_func* nio_sctp_getpaddrs;
|
||||
-sctp_freepaddrs_func* nio_sctp_freepaddrs;
|
||||
-sctp_bindx_func* nio_sctp_bindx;
|
||||
-sctp_peeloff_func* nio_sctp_peeloff;
|
||||
+extern sctp_getladdrs_func* nio_sctp_getladdrs;
|
||||
+extern sctp_freeladdrs_func* nio_sctp_freeladdrs;
|
||||
+extern sctp_getpaddrs_func* nio_sctp_getpaddrs;
|
||||
+extern sctp_freepaddrs_func* nio_sctp_freepaddrs;
|
||||
+extern sctp_bindx_func* nio_sctp_bindx;
|
||||
+extern sctp_peeloff_func* nio_sctp_peeloff;
|
||||
|
||||
jboolean loadSocketExtensionFuncs(JNIEnv* env);
|
||||
|
||||
diff --git a/src/jdk.sctp/unix/native/libsctp/SctpNet.c b/src/jdk.sctp/unix/native/libsctp/SctpNet.c
|
||||
index d40c15aa3..ab9b6e093 100644
|
||||
--- a/src/jdk.sctp/unix/native/libsctp/SctpNet.c
|
||||
+++ b/src/jdk.sctp/unix/native/libsctp/SctpNet.c
|
||||
@@ -43,6 +43,13 @@ static jmethodID isaCtrID = 0;
|
||||
static const char* nativeSctpLib = "libsctp.so.1";
|
||||
static jboolean funcsLoaded = JNI_FALSE;
|
||||
|
||||
+sctp_getladdrs_func* nio_sctp_getladdrs;
|
||||
+sctp_freeladdrs_func* nio_sctp_freeladdrs;
|
||||
+sctp_getpaddrs_func* nio_sctp_getpaddrs;
|
||||
+sctp_freepaddrs_func* nio_sctp_freepaddrs;
|
||||
+sctp_bindx_func* nio_sctp_bindx;
|
||||
+sctp_peeloff_func* nio_sctp_peeloff;
|
||||
+
|
||||
JNIEXPORT jint JNICALL DEF_JNI_OnLoad
|
||||
(JavaVM *vm, void *reserved) {
|
||||
return JNI_VERSION_1_2;
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@@ -1,119 +0,0 @@
|
||||
From 58911e9de888aece29f491995a8b8a31f7d6b424 Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Zhang <patrick.zhang@amperecomputing.com>
|
||||
Date: Wed, 05 Feb 2020 17:14:15 -0700
|
||||
Subject: [PATCH] fix gcc 10 support
|
||||
|
||||
This patch fixes the "multiple definition" link errors with GCC10 due to
|
||||
GCC10 setting -fno-common by default.
|
||||
|
||||
This is a combination of the following upstream commits:
|
||||
- https://hg.openjdk.java.net/jdk/jdk/rev/8e6fa89397ca
|
||||
- https://hg.openjdk.java.net/jdk/jdk/rev/6925fca95959
|
||||
- https://hg.openjdk.java.net/jdk/jdk/rev/9e54ea7d9cd9
|
||||
|
||||
Signed-off-by: Patrick Zhang <patrick.zhang@amperecomputing.com>
|
||||
Signed-off-by: Adam Duskett <Aduskett@gmail.com>
|
||||
---
|
||||
src/java.base/unix/native/libjava/childproc.c | 1 +
|
||||
src/java.base/unix/native/libjava/childproc.h | 2 +-
|
||||
.../share/native/libj2gss/NativeFunc.c | 3 +++
|
||||
.../share/native/libj2gss/NativeFunc.h | 2 +-
|
||||
src/jdk.sctp/unix/native/libsctp/Sctp.h | 12 ++++++------
|
||||
src/jdk.sctp/unix/native/libsctp/SctpNet.c | 7 +++++++
|
||||
6 files changed, 19 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/src/java.base/unix/native/libjava/childproc.c b/src/java.base/unix/native/libjava/childproc.c
|
||||
index 811aaeac5..16480bfbf 100644
|
||||
--- a/src/java.base/unix/native/libjava/childproc.c
|
||||
+++ b/src/java.base/unix/native/libjava/childproc.c
|
||||
@@ -34,6 +34,7 @@
|
||||
|
||||
#include "childproc.h"
|
||||
|
||||
+const char * const *parentPathv;
|
||||
|
||||
ssize_t
|
||||
restartableWrite(int fd, const void *buf, size_t count)
|
||||
diff --git a/src/java.base/unix/native/libjava/childproc.h b/src/java.base/unix/native/libjava/childproc.h
|
||||
index 091150930..d57e44b6e 100644
|
||||
--- a/src/java.base/unix/native/libjava/childproc.h
|
||||
+++ b/src/java.base/unix/native/libjava/childproc.h
|
||||
@@ -126,7 +126,7 @@ typedef struct _SpawnInfo {
|
||||
* 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);
|
||||
diff --git a/src/java.security.jgss/share/native/libj2gss/NativeFunc.c b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c
|
||||
index da7bc0445..5941f7b5a 100644
|
||||
--- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.c
|
||||
+++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.c
|
||||
@@ -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 --git a/src/java.security.jgss/share/native/libj2gss/NativeFunc.h b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h
|
||||
index 82914387c..e4a4981a3 100644
|
||||
--- a/src/java.security.jgss/share/native/libj2gss/NativeFunc.h
|
||||
+++ b/src/java.security.jgss/share/native/libj2gss/NativeFunc.h
|
||||
@@ -277,6 +277,6 @@ typedef struct GSS_FUNCTION_TABLE {
|
||||
typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR;
|
||||
|
||||
/* global GSS function table */
|
||||
-GSS_FUNCTION_TABLE_PTR ftab;
|
||||
+extern GSS_FUNCTION_TABLE_PTR ftab;
|
||||
|
||||
#endif
|
||||
diff --git a/src/jdk.sctp/unix/native/libsctp/Sctp.h b/src/jdk.sctp/unix/native/libsctp/Sctp.h
|
||||
index cc1367f78..46b07db0a 100644
|
||||
--- a/src/jdk.sctp/unix/native/libsctp/Sctp.h
|
||||
+++ b/src/jdk.sctp/unix/native/libsctp/Sctp.h
|
||||
@@ -322,12 +322,12 @@ typedef int sctp_peeloff_func(int sock, sctp_assoc_t id);
|
||||
|
||||
#endif /* __linux__ */
|
||||
|
||||
-sctp_getladdrs_func* nio_sctp_getladdrs;
|
||||
-sctp_freeladdrs_func* nio_sctp_freeladdrs;
|
||||
-sctp_getpaddrs_func* nio_sctp_getpaddrs;
|
||||
-sctp_freepaddrs_func* nio_sctp_freepaddrs;
|
||||
-sctp_bindx_func* nio_sctp_bindx;
|
||||
-sctp_peeloff_func* nio_sctp_peeloff;
|
||||
+extern sctp_getladdrs_func* nio_sctp_getladdrs;
|
||||
+extern sctp_freeladdrs_func* nio_sctp_freeladdrs;
|
||||
+extern sctp_getpaddrs_func* nio_sctp_getpaddrs;
|
||||
+extern sctp_freepaddrs_func* nio_sctp_freepaddrs;
|
||||
+extern sctp_bindx_func* nio_sctp_bindx;
|
||||
+extern sctp_peeloff_func* nio_sctp_peeloff;
|
||||
|
||||
jboolean loadSocketExtensionFuncs(JNIEnv* env);
|
||||
|
||||
diff --git a/src/jdk.sctp/unix/native/libsctp/SctpNet.c b/src/jdk.sctp/unix/native/libsctp/SctpNet.c
|
||||
index d40c15aa3..ab9b6e093 100644
|
||||
--- a/src/jdk.sctp/unix/native/libsctp/SctpNet.c
|
||||
+++ b/src/jdk.sctp/unix/native/libsctp/SctpNet.c
|
||||
@@ -43,6 +43,13 @@ static jmethodID isaCtrID = 0;
|
||||
static const char* nativeSctpLib = "libsctp.so.1";
|
||||
static jboolean funcsLoaded = JNI_FALSE;
|
||||
|
||||
+sctp_getladdrs_func* nio_sctp_getladdrs;
|
||||
+sctp_freeladdrs_func* nio_sctp_freeladdrs;
|
||||
+sctp_getpaddrs_func* nio_sctp_getpaddrs;
|
||||
+sctp_freepaddrs_func* nio_sctp_freepaddrs;
|
||||
+sctp_bindx_func* nio_sctp_bindx;
|
||||
+sctp_peeloff_func* nio_sctp_peeloff;
|
||||
+
|
||||
JNIEXPORT jint JNICALL DEF_JNI_OnLoad
|
||||
(JavaVM *vm, void *reserved) {
|
||||
return JNI_VERSION_1_2;
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@@ -0,0 +1,109 @@
|
||||
From 9a3c2a0714420186ae8d5159d5416c6fa2009ad9 Mon Sep 17 00:00:00 2001
|
||||
From: Alexey Brodkin <abrodkin@synopsys.com>
|
||||
Date: Mon, 18 Oct 2021 05:20:05 -0700
|
||||
Subject: [PATCH] Add ARCv2 ISA processors support to Zero
|
||||
|
||||
This adds ARCv2 processors support in OpenJDK via
|
||||
"Zero Assembly Project" (see https://openjdk.java.net/projects/zero).
|
||||
|
||||
That' a purely interpretive mode, so likely not that fast
|
||||
as JIT'ed version, but for starters it's much better than nothing.
|
||||
|
||||
Once all the logistical problems are solved hopefully this
|
||||
change will be accepted upstream.
|
||||
|
||||
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
|
||||
---
|
||||
make/autoconf/libraries.m4 | 8 ++++++++
|
||||
make/autoconf/platform.m4 | 8 ++++++++
|
||||
src/hotspot/os/linux/os_linux.cpp | 8 +++++++-
|
||||
3 files changed, 23 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
|
||||
index 5120918aed2..f7a99955874 100644
|
||||
--- a/make/autoconf/libraries.m4
|
||||
+++ b/make/autoconf/libraries.m4
|
||||
@@ -122,6 +122,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
|
||||
BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lpthread"
|
||||
fi
|
||||
|
||||
+ # Libatomic library
|
||||
+ # 32-bit ARC needs fallback library for 8-byte atomic ops
|
||||
+ # Inspired by a fix for MIPS, see https://github.com/openjdk/jdk/commit/1b3aa3af
|
||||
+ if test "x$OPENJDK_TARGET_OS" = xlinux &&
|
||||
+ (test "x$OPENJDK_TARGET_CPU" = xarc); then
|
||||
+ BASIC_JVM_LIBS="$BASIC_JVM_LIBS -latomic"
|
||||
+ fi
|
||||
+
|
||||
# perfstat lib
|
||||
if test "x$OPENJDK_TARGET_OS" = xaix; then
|
||||
BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lperfstat"
|
||||
diff --git a/make/autoconf/platform.m4 b/make/autoconf/platform.m4
|
||||
index c0f2446dbd7..dc416ece885 100644
|
||||
--- a/make/autoconf/platform.m4
|
||||
+++ b/make/autoconf/platform.m4
|
||||
@@ -54,6 +54,12 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU],
|
||||
VAR_CPU_BITS=64
|
||||
VAR_CPU_ENDIAN=little
|
||||
;;
|
||||
+ arc)
|
||||
+ VAR_CPU=arc
|
||||
+ VAR_CPU_ARCH=arc
|
||||
+ VAR_CPU_BITS=32
|
||||
+ VAR_CPU_ENDIAN=little
|
||||
+ ;;
|
||||
arm*)
|
||||
VAR_CPU=arm
|
||||
VAR_CPU_ARCH=arm
|
||||
@@ -478,6 +484,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER],
|
||||
HOTSPOT_$1_CPU_DEFINE=PPC64
|
||||
|
||||
# The cpu defines below are for zero, we don't support them directly.
|
||||
+ elif test "x$OPENJDK_$1_CPU" = xarc; then
|
||||
+ HOTSPOT_$1_CPU_DEFINE=ARC
|
||||
elif test "x$OPENJDK_$1_CPU" = xsparc; then
|
||||
HOTSPOT_$1_CPU_DEFINE=SPARC
|
||||
elif test "x$OPENJDK_$1_CPU" = xppc; then
|
||||
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
|
||||
index b08caf4d5d3..2bf084895ba 100644
|
||||
--- a/src/hotspot/os/linux/os_linux.cpp
|
||||
+++ b/src/hotspot/os/linux/os_linux.cpp
|
||||
@@ -1858,6 +1858,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
||||
#ifndef EM_AARCH64
|
||||
#define EM_AARCH64 183 /* ARM AARCH64 */
|
||||
#endif
|
||||
+#ifndef EM_ARC_COMPACT2
|
||||
+ #define EM_ARC_COMPACT2 195 /* ARC ARCv2 ISA */
|
||||
+#endif
|
||||
#ifndef EM_RISCV
|
||||
#define EM_RISCV 243 /* RISC-V */
|
||||
#endif
|
||||
@@ -1879,6 +1882,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
||||
{EM_SH, EM_SH, ELFCLASS32, ELFDATA2MSB, (char*)"SuperH BE"},
|
||||
#endif
|
||||
{EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"},
|
||||
+ {EM_ARC_COMPACT2, EM_ARC_COMPACT2, ELFCLASS32, ELFDATA2LSB, (char*)"ARC"},
|
||||
// we only support 64 bit z architecture
|
||||
{EM_S390, EM_S390, ELFCLASS64, ELFDATA2MSB, (char*)"IBM System/390"},
|
||||
{EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"},
|
||||
@@ -1906,6 +1910,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
||||
static Elf32_Half running_arch_code=EM_PPC;
|
||||
#elif (defined AARCH64)
|
||||
static Elf32_Half running_arch_code=EM_AARCH64;
|
||||
+#elif (defined ARC)
|
||||
+ static Elf32_Half running_arch_code=EM_ARC_COMPACT2;
|
||||
#elif (defined ARM)
|
||||
static Elf32_Half running_arch_code=EM_ARM;
|
||||
#elif (defined S390)
|
||||
@@ -1926,7 +1932,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
||||
static Elf32_Half running_arch_code=EM_RISCV;
|
||||
#else
|
||||
#error Method os::dll_load requires that one of following is defined:\
|
||||
- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc
|
||||
+ AARCH64, ALPHA, ARC, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc
|
||||
#endif
|
||||
|
||||
// Identify compatibility class for VM's architecture and library's architecture
|
||||
--
|
||||
2.16.2
|
||||
|
||||
@@ -6,6 +6,7 @@ config BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS
|
||||
config BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS
|
||||
bool
|
||||
default y if BR2_aarch64
|
||||
default y if BR2_arc && !(BR2_arc750d || BR2_arc770d)
|
||||
default y if BR2_arm
|
||||
default y if BR2_i386 || BR2_x86_64
|
||||
default y if BR2_m68k
|
||||
@@ -20,6 +21,11 @@ config BR2_PACKAGE_OPENJDK
|
||||
depends on !BR2_STATIC_LIBS # glibc
|
||||
depends on BR2_INSTALL_LIBSTDCPP # cups
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib, cups, libusb
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb, C++14 for OpenJDK17
|
||||
# Strictly needed only for OpenJDK17, but to keep dependencies
|
||||
# simple with ARC supported only with OpenJDK17, we make this
|
||||
# dependency apply to OpenJDK as a whole.
|
||||
depends on BR2_HOST_GCC_AT_LEAST_4_9 # C++14
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC
|
||||
depends on BR2_USE_MMU # cups
|
||||
depends on BR2_PACKAGE_XORG7
|
||||
@@ -50,15 +56,17 @@ if BR2_PACKAGE_OPENJDK
|
||||
|
||||
choice
|
||||
prompt "openjdk version"
|
||||
default BR2_OPENJDK_VERSION_LATEST
|
||||
default BR2_PACKAGE_OPENJDK_VERSION_17
|
||||
help
|
||||
Select the version of OpenJDK you wish to use.
|
||||
|
||||
config BR2_OPENJDK_VERSION_LTS
|
||||
bool "LTS (OpenJDK 11)"
|
||||
config BR2_PACKAGE_OPENJDK_VERSION_11
|
||||
bool "OpenJDK 11"
|
||||
# The ARC-specific OpenJDK patch only applies to OpenJDK 17.
|
||||
depends on !BR2_arc
|
||||
|
||||
config BR2_OPENJDK_VERSION_LATEST
|
||||
bool "latest (OpenJDK 14)"
|
||||
config BR2_PACKAGE_OPENJDK_VERSION_17
|
||||
bool "OpenJDK 17"
|
||||
|
||||
endchoice
|
||||
|
||||
@@ -118,18 +126,19 @@ config BR2_PACKAGE_OPENJDK_FULL_JDK
|
||||
|
||||
choice
|
||||
prompt "openjdk variant"
|
||||
default BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER if !BR2_powerpc
|
||||
default BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER if !(BR2_powerpc || BR2_arc)
|
||||
default BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO if BR2_powerpc
|
||||
default BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO if BR2_arc
|
||||
|
||||
config BR2_PACKAGE_OPENJDK_JVM_VARIANT_CLIENT
|
||||
bool "client"
|
||||
depends on !BR2_powerpc
|
||||
depends on !(BR2_powerpc || BR2_arc)
|
||||
help
|
||||
Quick loading, but slower run-time performance.
|
||||
|
||||
config BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER
|
||||
bool "server"
|
||||
depends on !BR2_powerpc
|
||||
depends on !(BR2_powerpc || BR2_arc)
|
||||
help
|
||||
Slower loading, but faster run-time performance.
|
||||
|
||||
@@ -151,12 +160,15 @@ comment "openjdk needs X.Org"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_PACKAGE_XORG7
|
||||
|
||||
comment "openjdk needs glibc, and a toolchain w/ wchar, dynamic library, threads, C++"
|
||||
comment "openjdk needs glibc, and a toolchain w/ wchar, dynamic library, threads, C++, gcc >= 4.9, host gcc >= 4.9"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS
|
||||
depends on BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS
|
||||
depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC
|
||||
!BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_TOOLCHAIN_USES_GLIBC || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
|
||||
!BR2_HOST_GCC_AT_LEAST_4_9
|
||||
|
||||
comment "openjdk does not support soft float configurations"
|
||||
depends on BR2_PACKAGE_OPENJDK_ARCH_SUPPORTS
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Locally computed
|
||||
sha256 dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935 jdk-14.0.2+12.tar.gz
|
||||
sha256 7fc124b5e20428cd5df42d78b001abc663558b0881e66a5def0892b98265b6e9 jdk-11.0.8+10.tar.gz
|
||||
sha256 2fdd23261526362d4aaf58323441d4c31d29de2e374ba94bbf2727a00adc0ea7 openjdk-17.0.2+8.tar.gz
|
||||
sha256 0e859cc03378439023e17ee82aecee5a52265fb38906a8bebf16027aa2b2bcf5 openjdk-11.0.14.1+1.tar.gz
|
||||
sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE
|
||||
|
||||
@@ -4,19 +4,15 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ifeq ($(BR2_OPENJDK_VERSION_LATEST),y)
|
||||
OPENJDK_VERSION_MAJOR = 14.0.2
|
||||
OPENJDK_VERSION_MINOR = 12
|
||||
OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR)
|
||||
OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz
|
||||
OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk14u/archive
|
||||
ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y)
|
||||
OPENJDK_VERSION_MAJOR = 17
|
||||
OPENJDK_VERSION_MINOR = 0.2+8
|
||||
else
|
||||
OPENJDK_VERSION_MAJOR = 11.0.8
|
||||
OPENJDK_VERSION_MINOR = 10
|
||||
OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR)
|
||||
OPENJDK_SOURCE = jdk-$(OPENJDK_VERSION).tar.gz
|
||||
OPENJDK_SITE = https://hg.openjdk.java.net/jdk-updates/jdk11u/archive
|
||||
OPENJDK_VERSION_MAJOR = 11
|
||||
OPENJDK_VERSION_MINOR = 0.14.1+1
|
||||
endif
|
||||
OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR)
|
||||
OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION))
|
||||
|
||||
OPENJDK_LICENSE = GPL-2.0+ with exception
|
||||
OPENJDK_LICENSE_FILES = LICENSE
|
||||
|
||||
Reference in New Issue
Block a user