[arch-commits] CVS update of extra/devel/java-gcj-compat (PKGBUILD)

[Jan de Groot]

    Date: Saturday, May 12, 2007 @ 16:50:10
  Author: jgc
    Path: /home/cvs-extra/extra/devel/java-gcj-compat

Modified: PKGBUILD (1.6 -> 1.7)

upgpkg: java-gcj-compat 1.0.76-2
Add some extra symlinks, make AMD64 friendly


----------+
 PKGBUILD |   26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)


Index: extra/devel/java-gcj-compat/PKGBUILD
diff -u extra/devel/java-gcj-compat/PKGBUILD:1.6 extra/devel/java-gcj-compat/PKGBUILD:1.7
--- extra/devel/java-gcj-compat/PKGBUILD:1.6	Mon Apr 30 09:03:12 2007
+++ extra/devel/java-gcj-compat/PKGBUILD	Sat May 12 16:50:10 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.6 2007/04/30 13:03:12 jgc Exp $
+# $Id: PKGBUILD,v 1.7 2007/05/12 20:50:10 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=java-gcj-compat
 pkgver=1.0.76
-pkgrel=1
+pkgrel=2
 pkgdesc="Wrapper package to wrap free tools into a java 1.4.2 compatible java environment"
 arch=(i686 x86_64)
 license=('GPL')
@@ -18,16 +18,32 @@
 build() {
   export MAKEFLAGS="-j1"
   cd ${startdir}/src/${pkgname}-${pkgver}
+  sed -i -e 's/sinjdoc/gjdoc/g' Makefile.* || return 1
   ./configure --prefix=/usr
   make || return 1
   make DESTDIR=${startdir}/pkg install
   mkdir -p ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib
   mkdir -p ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/lib
+  mkdir -p ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/include
   ln -s /usr/share/java/libgcj-4*.jar ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/rt.jar
   ln -s /usr/share/java/libgcj-tools-4*.jar ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/lib/tools.jar
-  mkdir -p ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/i386/{client,server}
-  ln -s /usr/lib/gcj-4.*/libjvm.so ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/i386/client/
-  ln -s /usr/lib/gcj-4.*/libjvm.so ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/i386/server/
+  ln -s /usr/lib/gcj-4.*/libjawt.so ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/lib/
+  ln -s /usr/lib/libgcj*.so ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/lib/
+  ln -s /usr/lib/libgij.so ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/lib/
+  for i in jni.h jni_md.h jawt.h jawt_md.h gcj; do
+    ln -s `gcj -print-file-name=include/${i}` ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/include/
+  done
+
+  if [ "${CARCH}" = "x86_64" ]; then
+    _arch=x86_64
+  else
+    _arch=i386
+  fi
+  mkdir -p ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/${_arch}/{client,server}
+  ln -s /usr/lib/gcj-4.*/libjvm.so ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/${_arch}/client/
+  ln -s /usr/lib/gcj-4.*/libjvm.so ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/${_arch}/server/
+  ln -s /usr/lib/gcj-4.*/libjawt.so ${startdir}/pkg/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre/lib/${_arch}/
+
   mkdir -p ${startdir}/pkg/etc/profile.d
   install -m755 ${startdir}/src/java-gcj-compat.profile ${startdir}/pkg/etc/profile.d/java-gcj-compat.sh