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

andyrtr at archlinux.org andyrtr at archlinux.org
Fri May 22 16:26:57 EDT 2009


    Date: Friday, May 22, 2009 @ 16:26:57
  Author: andyrtr
Revision: 39911

prepare new build

Modified:
  openjdk6/trunk/PKGBUILD

----------+
 PKGBUILD |   58 ++++++++++++++++++++++++++++------------------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-05-22 20:26:50 UTC (rev 39910)
+++ PKGBUILD	2009-05-22 20:26:57 UTC (rev 39911)
@@ -3,49 +3,50 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=openjdk6
-_date=20090429
+_date=20090522
 pkgver=1.5_hg${_date}
-_icedteaver=1.5pre
+_icedteaver=1.5
 pkgrel=1
 pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
 url='http://icedtea.classpath.org'
 arch=('i686' 'x86_64')
 license=('GPL')
 _openjdk_version=b16
-_openjdk_date=13_apr_2009
-_hotspotver=fc6a5ae3fef5 # what it downlopads itself / remove from configure to get it
+_openjdk_date=24_apr_2009
+_hotspotver=25a020f13592 # what it downlopads itself / remove from configure to get it
 depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java')
-makedepends=('alsa-lib' 'libxtst' 'giflib' 'libxp' 'gtk2' 'nspr' 'zlib' 'freetype2' 'libjpeg' 'libx11' 'libcups' 'patch' 'xalan-java' 'xulrunner>=1.9.0.3' 'apache-ant>=1.7.0' 'autoconf' 'unzip' 'rhino' 'mercurial')
+makedepends=('alsa-lib' 'libxtst' 'giflib' 'libxp' 'gtk2' 'nspr' 'zlib' 'freetype2' 'libjpeg' 'libx11' 'libcups' 'patch' 'xalan-java' 'xulrunner>=1.9.0.10' 'apache-ant>=1.7.0' 'autoconf' 'unzip' 'rhino' 'mercurial')
 conflicts=('java-environment' 'java-runtime')
 provides=('java-environment=6' 'java-runtime=6')
-options=(!emptydirs)
+options=('!emptydirs')
 install=openjdk6.install
 source=(http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
 	#http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
 	ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.bz2
-	http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/${_hotspotver}.tar.gz
+	#http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/${_hotspotver}.tar.gz
+	http://hg.openjdk.java.net/hsx/hsx14/master/archive/${_hotspotver}.tar.gz
 	fix_jdk_cmds_path.diff
 	fix_corba_cmds_path.diff
-	gcjwebplugin_xulrunner.diff
 	aatext_by_default.diff
 	fontconfig-paths.diff
 	openjdk6.profile)
 noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz ${_hotspotver}.tar.gz)
-md5sums=('d395b4d4ac8b2aff70730b953f9e2736'
-         '156f4efbdc0631cb7fd610c4ebaeda59'
-         '1c3510387dccdb4907d0fd2f1c58e372'
+md5sums=('850a29b70206bc7fa083cd26acc781f3'
+         '0458c10ea6a87523fde4f830d2253d68'
+         'dbd7aca5544d1aeebf0eadd45d29d08e'
          '5da3e39fa60985576c4f37d1491efbe2'
          'f7e7a212e50abb56a6ef1a2b1bd27405'
-         'ed2e808df2d2fc2ea7dae5139d475192'
          'ef60d567c0d9bad111212851220deafd'
          '104380f0b900c840141e572a7fb70c27'
          'd0703088e10aa957c037644ab88d716d')
 
 build() {
   # for hg checkout install mercurial and
-#  mkdir ${srcdir}/icedtea6-${_date}
-#  cd ${srcdir}/icedtea6-${_date}
-#  hg -v clone http://icedtea.classpath.org/hg/icedtea6 || return 1
+  mkdir ${srcdir}/icedtea6-${_date}
+  cd ${srcdir}/icedtea6-${_date}
+  ##  hg -v clone http://icedtea.classpath.org/hg/icedtea6 || return 1
+  # use 1.5 release branch
+#  hg -v clone http://icedtea.classpath.org/hg/release/icedtea6-1.5/ || return 1
 #  tar -cvjf ../../icedtea6-${_date}.tar.bz2 *
 #  return 1
 
@@ -59,20 +60,17 @@
   _javaver=1.6.0
   _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
-  cd ${srcdir}/icedtea6
-#  cd ${srcdir}/icedtea6-${_icedteaver}
+#  cd ${srcdir}/icedtea6
+  cd ${srcdir}/icedtea6-${_icedteaver}
   ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz .
   ln -s ${srcdir}/${_hotspotver}.tar.gz .
 
-  # fix xulrunner linking
-  patch -Np0 -i ${srcdir}/gcjwebplugin_xulrunner.diff || return 1
+#  cp ${srcdir}/*.diff ${srcdir}/icedtea6/patches/
+  cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
+#  export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fix_corba_cmds_path.diff patches/aatext_by_default.diff #patches/fontconfig-paths.diff"
 
-  cp ${srcdir}/*.diff ${srcdir}/icedtea6/patches/
-#  cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
-  export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fix_corba_cmds_path.diff patches/aatext_by_default.diff patches/fontconfig-paths.diff"
-
   ./autogen.sh
-  autoreconf # needed due to mercurial build
+#  autoreconf # needed due to mercurial build
 
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
@@ -84,9 +82,6 @@
     JCONF="--with-openjdk --with-openjdk-home=/opt/java"
   elif [ -x /usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/bin/javac ]; then
     JCONF="--with-gcj-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0 --with-javac"
-  elif [ -x /usr/lib/java-${_javaver}-openjdk/bin/javac ]; then
-    JCONF="--with-openjdk --with-openjdk-home=/usr/lib/java-${_javaver}-openjdk" 
-    # ^ only fallback to build with broken 1.2-3, can be removed later
   else
     echo "No supported java installation found, install either openjdk6, jdk or java-gcj-compat"
     return 1
@@ -95,13 +90,16 @@
   ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
 	--with-xalan2-jar=/usr/share/java/xalan.jar \
 	--with-hotspot-src-zip=${_hotspotver}.tar.gz \
+	--enable-npplugin \
 	--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH  $JCONF
+# 	--enable-visualvm \ --with-additional-vms=cacao,zero,shark \
+
   LD_PRELOAD="" make || return 1
-  
+ 
   install -m755 -d ${pkgdir}/${_jvmdir}/jre
 
-  pushd ${srcdir}/icedtea6/openjdk/build/linux-${_arch}/j2sdk-image
-#  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk/build/linux-${_arch}/j2sdk-image
+#  pushd ${srcdir}/icedtea6/openjdk/build/linux-${_arch}/j2sdk-image
+  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk/build/linux-${_arch}/j2sdk-image
    # Install main files.
   cp -a bin include lib src.zip ${pkgdir}/${_jvmdir}/ || return 1
   cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/ || return 1



More information about the arch-commits mailing list