From 42c2ce73c828ebedd39d7174b6d65cccab5d2934 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 22 Jul 2015 12:09:55 +0000
Subject: [PATCH] extra/java7-openjdk: v8 fix

---
 extra/java7-openjdk/PKGBUILD | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index f70e3854d..9b932eb23 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -5,11 +5,10 @@
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - removed doc package, --disable-docs in configure, this is measured in lifetimes to build on ARM
-#  - --enable-zero, hotspot changeset, url changed to use Zero hotspot source.
-#    original changeset left commented to be able to spot changes on package upgrades
+#  - --enable-zero
 #  - added our architectures to set _JARCH
 #  - strip -D_FORTIFY_SOURCE=2 from C/CXXFLAGS
-#  - specify default hotspot build (can remove for icedtea 2.6.0)
+#  - patch out aarch64 code that fails to build
 
 #noautobuild=1
 
@@ -43,7 +42,8 @@ source=(${_icedtea_url}/source/icedtea-${_icedtea_ver}.tar.gz
         icedtea_${_icedtea_ver}_langtools.tar.bz2::${_drops_url}/langtools.tar.bz2
         icedtea_${_icedtea_ver}_hotspot.tar.bz2::${_drops_url}/hotspot.tar.bz2
         fontconfig-paths.diff
-        openjdk7_nonreparenting-wm.diff)
+        openjdk7_nonreparenting-wm.diff
+        vmstructs.diff)
 
 # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2357
 
@@ -56,7 +56,8 @@ sha256sums=('491866e57199b0bc99d716be3eabaab97d9f6a698d1a652d748baeddeedfe963'
             '6db9bd16658fa8460e0afa4b05f28bd47148528d7581a403bea1e70f56cedd43'
             '00043b0c09aa06ce1766c2973d18b0283bd2128a44c94cde97b626a4856b68b3'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
-            '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b')
+            '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
+            '4d59e85aa42a52f688e3b80f8c5e0bb06f7dd52327fbbd46ee57fddfa254f335')
 
 noextract=(icedtea_${_icedtea_ver}_openjdk.tar.bz2
            icedtea_${_icedtea_ver}_corba.tar.bz2
@@ -69,6 +70,7 @@ noextract=(icedtea_${_icedtea_ver}_openjdk.tar.bz2
  [ "$CARCH" = "x86_64" ] && _JARCH=amd64
  [ "$CARCH" = "i686" ] && _JARCH=i386
  [ "$CARCH" = "arm" -o "$CARCH" = "armv6h" -o "$CARCH" = "armv7h" ] && _JARCH=arm
+ [ "$CARCH" = "aarch64" ] && _JARCH=aarch64
 
 _jvmdir=/usr/lib/jvm/java-7-openjdk
 _imgdir="icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
@@ -89,7 +91,8 @@ build() {
 
   cp "${srcdir}"/*.diff "${srcdir}"/icedtea-${_icedtea_ver}/patches
   export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
-                               patches/openjdk7_nonreparenting-wm.diff"
+                               patches/openjdk7_nonreparenting-wm.diff \
+                               patches/vmstructs.diff"
 
   if [ "$_bootstrap" = "1" ]; then
      BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar"
@@ -116,8 +119,7 @@ build() {
         --with-abs-install-dir=${_jvmdir} \
         --enable-infinality=no \
         --disable-docs \
-        --enable-zero \
-        --with-hotspot-build=default
+        --enable-zero
     make
 }