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

[Jan de Groot]

    Date: Sunday, July 8, 2007 @ 07:57:09
  Author: jgc
    Path: /home/cvs-extra/extra/devel/gcc-gcj

Modified: PKGBUILD (1.32 -> 1.33)

Create symlinks so we don't have to patch/rebuild OpenOffice and java-gcj-compat everytime.


----------+
 PKGBUILD |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)


Index: extra/devel/gcc-gcj/PKGBUILD
diff -u extra/devel/gcc-gcj/PKGBUILD:1.32 extra/devel/gcc-gcj/PKGBUILD:1.33
--- extra/devel/gcc-gcj/PKGBUILD:1.32	Sat Jul  7 10:22:46 2007
+++ extra/devel/gcc-gcj/PKGBUILD	Sun Jul  8 07:57:09 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.32 2007/07/07 14:22:46 andyrtr Exp $
+# $Id: PKGBUILD,v 1.33 2007/07/08 11:57:09 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 # There's a circular dependency between gcc-gcj and eclipse-ecj. There is no 
@@ -14,7 +14,7 @@
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
 url="http://gcc.gnu.org"
-depends=('gcc>=4.2.1-2' 'gtk2>=2.10.12' 'file' 'libsm' 'libxtst' 'alsa-lib' 'eclipse-ecj>=3.3')
+depends=('gcc>=4.2.1' 'gtk2>=2.10.12' 'file' 'libsm' 'libxtst' 'alsa-lib' 'eclipse-ecj>=3.3')
 makedepends=('texinfo' 'pkgconfig' 'xulrunner' 'libart-lgpl' 'jack-audio-connection-kit' 'libxtst')
 noextract=("gcc-ecj-${_javaver}.tar.bz2")
 options=('!libtool')
@@ -55,7 +55,7 @@
   chmod +x ${startdir}/src/*.dpatch
   ${startdir}/src/libjava-disable-static.dpatch -patch || return 1
   ${startdir}/src/libjava-sjlj.dpatch -patch || return 1
-  patch -Np0 -i ${startdir}/src/gcc-hash-style-both.patch || return 1
+  #patch -Np0 -i ${startdir}/src/gcc-hash-style-both.patch || return 1
   patch -Np0 -i ${startdir}/src/gcj-4.3-tools.jar-path.diff || return 1
   patch -Np0 -i ${startdir}/src/java-signed-type.patch || return 1
 
@@ -127,4 +127,8 @@
 
    # Save >10MB with this one, makepkg only strips debug symbols.
    find ${startdir}/pkg/usr/lib -type f -name '*.so.*' -exec strip --strip-unneeded {} \;
+
+   ln -sf gcj-${pkgver} ${startdir}/pkg/usr/lib/gcj-4.2
+   ln -sf libgcj-${pkgver}.jar ${startdir}/pkg/usr/share/java/libgcj-4.2.jar
+   ln -sf libgcj-tools-${pkgver}.jar ${startdir}/pkg/usr/share/java/libgcj-tools-4.2.jar
 }