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

[Jan de Groot]

    Date: Thursday, August 2, 2007 @ 17:07:18
  Author: jgc
    Path: /home/cvs-extra/extra/devel/gcc-gcj

Modified: PKGBUILD (1.34 -> 1.35)

Prepare for gcc 4.2.1 final + latest java snapshot (taken from ubuntu/gcc_4_2_branch)


----------+
 PKGBUILD |   26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)


Index: extra/devel/gcc-gcj/PKGBUILD
diff -u extra/devel/gcc-gcj/PKGBUILD:1.34 extra/devel/gcc-gcj/PKGBUILD:1.35
--- extra/devel/gcc-gcj/PKGBUILD:1.34	Sun Jul  8 08:40:11 2007
+++ extra/devel/gcc-gcj/PKGBUILD	Thu Aug  2 17:07:18 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.34 2007/07/08 12:40:11 jgc Exp $
+# $Id: PKGBUILD,v 1.35 2007/08/02 21:07:18 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 # There's a circular dependency between gcc-gcj and eclipse-ecj. There is no 
@@ -7,33 +7,32 @@
 
 pkgname=gcc-gcj
 pkgver=4.2.1
-pkgrel=3
-_snapshot=4.2.1-RC-20070703
-_javaver=20070626
+pkgrel=4
+#_snapshot=4.2.1-RC-20070703
+_javaver=20070802
 pkgdesc="GNU Java Environment"
 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-3' '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')
-source=(ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++}-${_snapshot}.tar.bz2
+source=(#ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++}-${_snapshot}.tar.bz2
+	ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2
 	http://www.archlinux.org/~jgc/gcc/gcc-ecj-${_javaver}.tar.bz2
 	gcj-4.3-tools.jar-path.diff
 	gcc_pure64.patch
 	libjava-disable-static.dpatch
 	libjava-sjlj.dpatch
-	java-signed-type.patch
 	gcc-hash-style-both.patch)
-md5sums=('03bda7b8ae95d505afe459fd2b84a193'
-         '4996ba1ed47f4313e9d6d8a61b0c36d8'
-         'a1f1e28de91c19fa698205b868db55ed'
+md5sums=('88007169104d247eccb07dc5de2e0137'
+         '0aca4ef04eb57d9f356c431496bdad0b'
+         '1f706ee8106b50e3f99769197ab045e2'
          '602eb960c7752cc4877309e691110c06'
          '8fc86e4c4d1f4ec8b226307d39fbd9e3'
          'bef24466abe00c4e655ac074cedf0c29'
          'afe3541abf5ce163223f94ccdbc66e30'
-         '1b51e5215739d6b578480e373ca64b5a'
          '611fbd749019f0ce2fad36fda17e93dd')
 
 build() {
@@ -43,7 +42,8 @@
   fi
   [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh ]
 
-  cd ${startdir}/src/gcc-${_snapshot}
+  #cd ${startdir}/src/gcc-${_snapshot}
+  cd ${startdir}/src/gcc-${pkgver}
   tar jxf ${startdir}/src/gcc-ecj-${_javaver}.tar.bz2 || return 1
   # Don't install libiberty
   sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
@@ -57,10 +57,8 @@
   ${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/gcj-4.3-tools.jar-path.diff || return 1
-  patch -Np0 -i ${startdir}/src/java-signed-type.patch || return 1
 
   echo ${pkgver} > gcc/BASE-VER
-  echo "80:0:0" > libjava/libtool-version
 
   mkdir build
   cd build