[arch-commits] Commit in openjdk6/repos (3 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Thu Sep 10 14:44:27 UTC 2009


    Date: Thursday, September 10, 2009 @ 10:44:26
  Author: andyrtr
Revision: 51683

Merged revisions 51682 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/openjdk6/trunk

........
  r51682 | andyrtr | 2009-09-10 14:43:39 +0000 (Do, 10 Sep 2009) | 2 lines
  
  upgpkg: openjdk6 1.6-1
      new upstream release, change path to upstream recommended naming. they force us to do so to be able to build against itself, remove mercurial build lines we don't need anymore
........

Modified:
  openjdk6/repos/extra-x86_64/	(properties)
  openjdk6/repos/extra-x86_64/PKGBUILD
  openjdk6/repos/extra-x86_64/openjdk6.profile

------------------+
 PKGBUILD         |   52 ++++++++++++++++------------------------------------
 openjdk6.profile |    8 +++++---
 2 files changed, 21 insertions(+), 39 deletions(-)


Property changes on: openjdk6/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /openjdk6/trunk:1-51059
   + /openjdk6/trunk:1-51682

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-09-10 14:43:39 UTC (rev 51682)
+++ extra-x86_64/PKGBUILD	2009-09-10 14:44:26 UTC (rev 51683)
@@ -4,17 +4,14 @@
 
 pkgname=('openjdk6' 'openjdk6-src')
 pkgbase="openjdk6"
-_date=20090524
-#pkgver=1.5_hg${_date}
-_icedteaver=1.5.2
+_icedteaver=1.6
+_openjdk_version=b16
+_openjdk_date=24_apr_2009
 pkgver=${_icedteaver}
- _hgver=926c38e2b283 # =hg rc3 tagged, see http://icedtea.classpath.org/hg/icedtea6/summary
 pkgrel=1
 url='http://icedtea.classpath.org'
 arch=('i686' 'x86_64')
 license=('GPL')
-_openjdk_version=b16
-_openjdk_date=24_apr_2009
  # Use the new HS Express repository and hs14b15
  # http://icedtea.classpath.org/hg/release/icedtea6-1.5/rev/30d0a78a8748
 _hotspotver=09f7962b8b44 # what it downlopads itself / remove from configure to get it
@@ -35,7 +32,7 @@
 	libjpeg7.patch
 	openjdk6.profile)
 noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz ${_hotspotver}.tar.gz)
-md5sums=('7d3d3f6d8afb0783e52060e72708f65d'
+md5sums=('6135dab80af2f45faa20025c170074bf'
          '850a29b70206bc7fa083cd26acc781f3'
          '600284e870609a7531163bf2972c573b'
          '5da3e39fa60985576c4f37d1491efbe2'
@@ -44,54 +41,39 @@
          'ee1afda124d5927345014ab382ef581e'
          '409812b5675f9678b1c9e1a12a945a9a'
          '2f820743e8ed5540b5667fda33c53d26'
-         '4a081208ff1d99916f604c724af6efe5')
-
+         '10d13b19762218ee157273cee874394e')
+                                                                                                   
 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
-  # 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
 
   unset JAVA_HOME
   unset CLASSPATH
   
     [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
   
-  _javaver=1.6.0
+#  _javaver=1.6.0
+  _javaver=6
   _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
-#  cd ${srcdir}/icedtea6
   cd ${srcdir}/icedtea6-${_icedteaver}
-#  cd ${srcdir}/icedtea6-${_hgver}
   ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz .
   ln -s ${srcdir}/${_hotspotver}.tar.gz .
 
-#  cp ${srcdir}/*.diff ${srcdir}/icedtea6/patches/
   cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
-#  cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_hgver}/patches/
 
   # workaround for libjpeg .so bump to avoid a few segfaults. some stuff will remain broken
   patch -Np1 -i ${srcdir}/libjpeg7.patch || return 1
 
-#  export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fix_corba_cmds_path.diff patches/aatext_by_default.diff patches/fontconfig-paths.diff"
   export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/aatext_by_default.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff "
 
-#  ./autogen.sh
-#  autoreconf # needed due to mercurial build
-
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
   unset MAKEFLAGS
 
   if [ -x ${_jvmdir}/bin/javac ]; then
-    JCONF="--with-openjdk --with-openjdk-home=${_jvmdir}"
+    JCONF="--with-openjdk"
   elif [ -x /opt/java/bin/javac ]; then
-    JCONF="--with-openjdk --with-openjdk-home=/opt/java"
-  else
+    JCONF="--with-openjdk"
+      else
     echo "No supported java installation found, install either openjdk6 or jdk"
     return 1
   fi
@@ -101,7 +83,7 @@
 	--with-ant-home=/usr/share/java/apache-ant \
 	--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH  $JCONF \
 	--with-hotspot-src-zip=${_hotspotver}.tar.gz
-
+	
 #	--enable-npplugin \
 # 	--enable-visualvm \ --with-additional-vms=cacao,zero,shark \
 
@@ -123,15 +105,14 @@
   else
     _arch=i586
   fi
-  _javaver=1.6.0
+#  _javaver=1.6.0
+  _javaver=6
   _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
   cd ${srcdir}/icedtea6-${_icedteaver}
   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-${_hgver}/openjdk/build/linux-${_arch}/j2sdk-image
    # Install main files.
   cp -a bin include lib ${pkgdir}/${_jvmdir}/ || return 1
   cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/ || return 1
@@ -198,15 +179,14 @@
   else
     _arch=i586
   fi
-  _javaver=1.6.0
+ # _javaver=1.6.0
+  _javaver=6
   _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
   cd ${srcdir}/icedtea6-${_icedteaver}
   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-${_hgver}/openjdk/build/linux-${_arch}/j2sdk-image
    # Install src.zip file
   cp -a src.zip ${pkgdir}/${_jvmdir}/ || return 1
 }

Modified: extra-x86_64/openjdk6.profile
===================================================================
--- extra-x86_64/openjdk6.profile	2009-09-10 14:43:39 UTC (rev 51682)
+++ extra-x86_64/openjdk6.profile	2009-09-10 14:44:26 UTC (rev 51683)
@@ -1,6 +1,8 @@
-export J2SDKDIR=/usr/lib/jvm/java-1.6.0-openjdk
+#export J2SDKDIR=/usr/lib/jvm/java-1.6.0-openjdk
+export J2SDKDIR=/usr/lib/jvm/java-6-openjdk
 export J2REDIR=$J2SDKDIR/jre
-export JAVA_HOME=/usr/lib/jvm/java-1.6.0-openjdk
+#export JAVA_HOME=/usr/lib/jvm/java-1.6.0-openjdk
+export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
 
 # enable this for non-reparenting window managers
-#_JAVA_AWT_WM_NONREPARENTING=1
\ No newline at end of file
+#_JAVA_AWT_WM_NONREPARENTING=1




More information about the arch-commits mailing list