From 25cfb701e28ee0391aa922eff1c83619e31071b7 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Jun 10 2015 17:22:49 +0000 Subject: backported linux 4 kernel --- diff --git a/java-1.8.0-openjdk-linux-4.x.patch b/java-1.8.0-openjdk-linux-4.x.patch new file mode 100644 index 0000000..291f7b4 --- /dev/null +++ b/java-1.8.0-openjdk-linux-4.x.patch @@ -0,0 +1,12 @@ +diff -up jdk8/hotspot/make/linux/Makefile.linux4 jdk8/hotspot/make/linux/Makefile +--- jdk8/hotspot/make/linux/Makefile.linux4 2015-06-09 10:14:48.000000000 -0400 ++++ jdk8/hotspot/make/linux/Makefile 2015-06-09 10:14:54.000000000 -0400 +@@ -229,7 +229,7 @@ checks: check_os_version check_j2se_vers + # 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% ++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)) + diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 90eddf2..6e80d30 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -718,6 +718,9 @@ Patch13: libjpeg-turbo-1.4-compat.patch # OpenJDK specific patches # +# http://hg.openjdk.java.net/jdk9/hs/hotspot/rev/471b684ff43e +# allow build on Linux 4.x kernels +Patch99: java-1.8.0-openjdk-linux-4.x.patch # JVM heap size changes for s390 (thanks to aph) Patch100: %{name}-s390-java-opts.patch # Type fixing for s390 @@ -1003,6 +1006,8 @@ cp %{SOURCE101} jdk8/common/autoconf/build-aux/ # Remove libraries that are linked sh %{SOURCE12} +%patch99 + # Add AArch64 support to configure & JDK build %patch9999 @@ -1726,6 +1731,7 @@ end * Fri Jun 05 2015 Jiri Vanek - 1:1.8.0.45-40.b14 - added requires lksctp-tools for headless subpackage to make sun.nio.ch.sctp work - added patch506 rhbz1213280-b51c6914f297.patch +- allow build on Linux 4.x kernel (sync from master) * Mon May 25 2015 Jiri Vanek - 1:1.8.0.45-39.b14 - patches 501-503 moved out of with_systemtap block