[arch-commits] Commit in openjdk6/repos (extra-i686 extra-i686/PKGBUILD)

[andyrtr at archlinux.org]

    Date: Tuesday, August 26, 2008 @ 04:25:10
  Author: andyrtr
Revision: 10326

Merged revisions 10310-10325 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/openjdk6/trunk

........
  r10324 | andyrtr | 2008-08-26 07:40:54 +0000 (Di, 26 Aug 2008) | 2 lines
  
  upgpkg: openjdk6 1.2-4
      fix broken jvm location to march /etc/profile.d/openjdk6.sh again
........

Modified:
  openjdk6/repos/extra-i686/	(properties)
  openjdk6/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)


Property changes on: openjdk6/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /openjdk6/trunk:1-10309
   + /openjdk6/trunk:1-10325

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-08-26 07:41:25 UTC (rev 10325)
+++ extra-i686/PKGBUILD	2008-08-26 08:25:10 UTC (rev 10326)
@@ -4,7 +4,7 @@
 pkgname=openjdk6
 pkgver=1.2
 _date=20080825
-pkgrel=3
+pkgrel=4
 pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
 url='http://icedtea.classpath.org'
 arch=('i686' 'x86_64')
@@ -51,7 +51,7 @@
     _arch=i586
   fi
   _javaver=1.6.0
-  _jvmdir=/usr/lib/java-${_javaver}-openjdk
+  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
   cd ${srcdir}/icedtea6
   ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz .
@@ -75,6 +75,9 @@
     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