From add1e8262e559532869b733aad5a711a03f46c51 Mon Sep 17 00:00:00 2001
From: Isaac David <isacdaavid@isacdaavid.info>
Date: Tue, 13 Oct 2015 18:13:37 -0500
Subject: libre/java7-openjdk: add armv7h support

---
 libre/java7-openjdk/PKGBUILD | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'libre/java7-openjdk/PKGBUILD')

diff --git a/libre/java7-openjdk/PKGBUILD b/libre/java7-openjdk/PKGBUILD
index b19e2b11c..933ee953d 100644
--- a/libre/java7-openjdk/PKGBUILD
+++ b/libre/java7-openjdk/PKGBUILD
@@ -15,11 +15,11 @@ _icedtea_ver=2.6.1
 #}
 _updatever=85
 pkgver=${_java_ver}.u${_updatever}_${_icedtea_ver}
-pkgrel=1.parabola1
+pkgrel=1.parabola2
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'armv7h')
 url='http://icedtea.classpath.org'
 license=('custom')
 options=('!emptydirs')
@@ -64,6 +64,7 @@ noextract=(icedtea_${_icedtea_ver}_openjdk.tar.bz2
 
 [ "$CARCH" = "x86_64" ] && _JARCH=amd64
 [ "$CARCH" = "i686" ]   && _JARCH=i386
+[ "$CARCH" = "armv7h" ] && _JARCH=arm
 
 _jvmdir=/usr/lib/jvm/java-7-openjdk
 _imgdir="icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
@@ -75,6 +76,11 @@ _nonheadless=(bin/policytool
 build() {
   cd "${srcdir}/icedtea-${_icedtea_ver}"
 
+  if [ "$CARCH" != "armv7h" ]; then
+    CFLAGS=`echo $CFLAGS | sed -e 's/-D_FORTIFY_SOURCE=2//'` && CXXFLAGS="$CFLAGS"
+    configure_extra="--disable-docs --enable-zero"
+  fi
+
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
 
@@ -107,7 +113,8 @@ build() {
         --enable-nss \
         --with-rhino \
         --with-abs-install-dir=${_jvmdir} \
-        --enable-infinality=no
+        --enable-infinality=no \
+        ${configure_extra}
         # TODO latest version of openjdk will disable infinality by default
     make
 }
@@ -287,7 +294,7 @@ package_jdk7-openjdk() {
   install -m644 "${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop" "${pkgdir}/usr/share/applications"
 
   # Temporarily fixing FS#35141
-  chmod go+r "${pkgdir}${_jvmdir}/lib/sa-jdi.jar"
+  [ "$CARCH" != "armv7h" ] && chmod go+r "${pkgdir}${_jvmdir}/lib/sa-jdi.jar"
 
   # link license
   install -d -m755 "${pkgdir}/usr/share/licenses"
-- 
cgit v1.2.3