[arch-commits] Commit in java7-openjdk/trunk (PKGBUILD)

[andyrtr at archlinux.org]

    Date: Tuesday, September 4, 2012 @ 11:32:33
  Author: andyrtr
Revision: 166032

minor cosmetic changes, wget is not needed when we have all sources in our array

Modified:
  java7-openjdk/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-09-04 15:32:14 UTC (rev 166031)
+++ PKGBUILD	2012-09-04 15:32:33 UTC (rev 166032)
@@ -1,21 +1,18 @@
 # $Id$
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
-# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
 
 pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') 
  # ToDo -demo -doc packages, see Debian file lists http://packages.debian.org/source/wheezy/openjdk-7
 pkgbase=java7-openjdk
 _java_ver=7
 _updatever=u7
-_openjdk_build=b147
-_openjdk_date=27_jun_2011
 _icedtea_ver=2.3.2
-_date=20110922
 
 # check "${srcdir}/icedtea7"/Makefile.am
 _CORBA_CHANGESET=7fae6a3a68c7
-_HOTSPOT_CHANGESET=ea39d76b3bde
+_HOTSPOT_CHANGESET=ea39d76b3bde # see "${srcdir}/icedtea7"/hotspot.map
 _JAXP_CHANGESET=ee4bd94136ec
 _JAXWS_CHANGESET=c89c6ac953e7
 _JDK_CHANGESET=f78eb7e08ee1
@@ -30,13 +27,11 @@
 url="http://icedtea.classpath.org"
 license=('custom')
 options=('!emptydirs')
-makedepends=('jdk7-openjdk' 'libxp' 'libxslt' 'wget'
+makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
              'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2'
              'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # 'inetutils' 'grep') # fastjar`?
 [ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj')
 
-#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip
-
 _url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3
 source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz{,.sig}
         ${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz						# openjdk.tar.gz
@@ -93,8 +88,6 @@
   # default is to build with first found java-environment found in our repos - is jdk7-openjdk
   [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh
   
-#  unset MAKEFLAGS # parallel build is currently broken 
-
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
 
@@ -113,6 +106,7 @@
 	$BOOTSTRAPOPT \
         --with-parallel-jobs="${MAKEFLAGS/-j}" \
         --disable-tests \
+        --disable-downloading --disable-Werror \
         --with-pkgversion="ArchLinux build ${pkgver}-${pkgrel}-${CARCH}" \
         --with-jdk-home=${JAVA_HOME} \
         --with-openjdk-src-zip=${srcdir}/${_OPENJDK_CHANGESET}.tar.gz \
@@ -126,9 +120,6 @@
         --enable-nss \
         --with-rhino \
         --with-abs-install-dir=${_jvmdir}
-	#--help
-	#--enable-systemtap      Enable inclusion of SystemTap trace support - needs systemtab from AUR
-
     make
 }