aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-core
diff options
context:
space:
mode:
authorNicola Lunghi <nick83ola@gmail.com>2019-06-17 14:14:37 +0100
committerRichard Leitner <richard.leitner@skidata.com>2019-06-25 13:10:34 +0200
commitd82f628867f493d9de9172217e26aec5d0ce6c68 (patch)
tree11d88f821afeecf48016e603bebc7721855966a8 /recipes-core
parente737745a3f2a9f0aea7d2e0ac03d496143fcc7be (diff)
downloadmeta-java-d82f628867f493d9de9172217e26aec5d0ce6c68.tar.gz
meta-java-d82f628867f493d9de9172217e26aec5d0ce6c68.tar.bz2
meta-java-d82f628867f493d9de9172217e26aec5d0ce6c68.zip
openjdk-8: Enable HotSpot builds on 5.x Linux kernels
This is a backport of a patch to enable hotspot builds with 5.x kernels. Signed-off-by: Nicola Lunghi <nick83ola@gmail.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core')
-rw-r--r--recipes-core/openjdk/openjdk-8-release-172b11-common.inc1
-rw-r--r--recipes-core/openjdk/patches-openjdk-8/0020-Enable-HotSpot-builds-on-5.x-Linux-kernels.patch43
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
+