diff options
| -rw-r--r-- | recipes-core/openjdk/openjdk-8-release-172b11-common.inc | 1 | ||||
| -rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch | 43 |
2 files changed, 44 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-8-release-172b11-common.inc b/recipes-core/openjdk/openjdk-8-release-172b11-common.inc index ad20585..a8d3ccb 100644 --- a/recipes-core/openjdk/openjdk-8-release-172b11-common.inc +++ b/recipes-core/openjdk/openjdk-8-release-172b11-common.inc @@ -29,6 +29,7 @@ HOTSPOT_UB_PATCH = "\ file://0017-hotspot-Missing-return-statement-in-__sync_val_compa.patch \ file://0018-hotspot-Fix-debug-build-after-8062808-Turn-on-the-Wr.patch \ file://0019-hotspot-Turn-on-the-Wreturn-type-warning.patch \ + file://0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch \ " HOTSPOT_UB_PATCH_prepend_aarch64 = "\ file://0012-hotspot-aarch64-fix-undefined-behaviour-gcc-v8-fix.patch \ diff --git a/recipes-core/openjdk/patches-openjdk-8/0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch b/recipes-core/openjdk/patches-openjdk-8/0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch new file mode 100644 index 0000000..f9feca0 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch @@ -0,0 +1,43 @@ +From 90220d41f65910b108c901977eefe78fc1edecc5 Mon Sep 17 00:00:00 2001 +From: Nicola Lunghi <nicola.lunghi@jci.com> +Date: Mon, 17 Jun 2019 13:59:26 +0100 +Subject: [PATCH] Enable HotSpot builds on 5.x Linux kernels + +8217753: Enable HotSpot builds on 5.x Linux kernels +Summary: Remove Linux kernel version check as very unlikely a kernel older than 2.4 will be used. +Reviewed-by: erikj + +Upstream-Status: Backport (http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/5af8ec63c21c) +--- + hotspot/make/linux/Makefile | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) + +diff --git a/hotspot/make/linux/Makefile b/hotspot/make/linux/Makefile +index 17c14097..e8f20104 100644 +--- a/hotspot/make/linux/Makefile ++++ b/hotspot/make/linux/Makefile +@@ -227,20 +227,7 @@ all: + @echo " $(TARGETS_SHARK)" + @echo " $(TARGETS_MINIMAL1)" + +-checks: check_os_version check_j2se_version +- +-# We do not want people accidentally building on old systems (e.g. Linux 2.2.x, +-# Solaris 2.5.1, 2.6). +-# Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok. +- +-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4% +-OS_VERSION := $(shell uname -r) +-EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) +- +-check_os_version: +-ifeq ($(DISABLE_HOTSPOT_OS_VERSION_CHECK)$(EMPTY_IF_NOT_SUPPORTED),) +- $(QUIETLY) >&2 echo "*** This OS is not supported:" `uname -a`; exit 1; +-endif ++checks: check_j2se_version + + # jvmti.make requires XSLT (J2SE 1.4.x or newer): + XSLT_CHECK = $(REMOTE) $(RUN.JAVAP) javax.xml.transform.TransformerFactory +-- +2.20.1 + |