[arch-commits] Commit in java8-openjdk/trunk (JDK-8074312-hotspot.patch PKGBUILD)

[Guillaume Alaux]

    Date: Sunday, June 21, 2015 @ 23:13:49
  Author: guillaume
Revision: 241169

Add patch to fix build with linux4

Added:
  java8-openjdk/trunk/JDK-8074312-hotspot.patch
Modified:
  java8-openjdk/trunk/PKGBUILD

---------------------------+
 JDK-8074312-hotspot.patch |   12 ++++++++++++
 PKGBUILD                  |   10 ++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

Added: JDK-8074312-hotspot.patch
===================================================================
--- JDK-8074312-hotspot.patch	                        (rev 0)
+++ JDK-8074312-hotspot.patch	2015-06-21 21:13:49 UTC (rev 241169)
@@ -0,0 +1,12 @@
+diff -r 61edd5c7412e make/linux/Makefile
+--- a/make/linux/Makefile	Mon Mar 02 18:12:06 2015 +0000
++++ b/make/linux/Makefile	Tue Mar 03 15:58:13 2015 +0100
+@@ -233,7 +233,7 @@
+ # 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))
+ 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-21 20:51:27 UTC (rev 241168)
+++ PKGBUILD	2015-06-21 21:13:49 UTC (rev 241169)
@@ -28,7 +28,8 @@
         jaxws-${_repo_ver}.tar.gz::${_url_src}/jaxws/archive/${_repo_ver}.tar.gz
         jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz
         langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz
-        nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz)
+        nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz
+        JDK-8074312-hotspot.patch)
 
 sha256sums=('b3567bc0383fedb263cd0b2ba84c8716b0dc4e51cf2828c56cdfd96e2d1aa6b2'
             '6158c421b49b6c197e17e198525998505f4643c4c7a6b92278f8e700e77f99de'
@@ -37,7 +38,8 @@
             'e6f6233c26335536436de89ebf741df8b142119d8b41abc34c3287dd155a43bb'
             'c5e0f96dd56326598bdd5e29c16ca63f2b12becf0228b6bac6688260c08e5976'
             'eed8556576f39d6028e5ce31560b157cf956ee82367501435c5844fd2ca970b9'
-            'e18987e06e448820daa49e2ea5ef6dee2f497dadba5a2488bb707ba574cf30e9')
+            'e18987e06e448820daa49e2ea5ef6dee2f497dadba5a2488bb707ba574cf30e9'
+            '95fbd155806cac22de9e6df6f4f92ae79530f86d63cea1deaf98e607953e0b50')
 
 case "${CARCH}" in
   'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;;
@@ -60,6 +62,10 @@
   do
     ln -s ../${subrepo}-${_repo_ver} ${subrepo}
   done
+
+  # https://bugs.openjdk.java.net/browse/JDK-8074312
+  cd "${srcdir}/hotspot-${_repo_ver}"
+  patch -p1 < ${srcdir}/JDK-8074312-hotspot.patch
 }
 
 build() {