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

[Jan de Groot]

    Date: Friday, May 18, 2007 @ 19:47:13
  Author: jgc
    Path: /home/cvs-extra/extra/devel/gcc-gcj

Modified: PKGBUILD (1.20 -> 1.21)

upgpkg: gcc-gcj 4.2.0-1
Update to 4.2.0, take a libgcj snapshot from  trunk


----------+
 PKGBUILD |   57 +++++++++++----------------------------------------------
 1 file changed, 11 insertions(+), 46 deletions(-)


Index: extra/devel/gcc-gcj/PKGBUILD
diff -u extra/devel/gcc-gcj/PKGBUILD:1.20 extra/devel/gcc-gcj/PKGBUILD:1.21
--- extra/devel/gcc-gcj/PKGBUILD:1.20	Mon Apr 30 07:56:53 2007
+++ extra/devel/gcc-gcj/PKGBUILD	Fri May 18 19:47:13 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.20 2007/04/30 11:56:53 jgc Exp $
+# $Id: PKGBUILD,v 1.21 2007/05/18 23:47:13 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 # There's a circular dependency between gcc-gcj and eclipse-ecj. There is no 
@@ -6,49 +6,27 @@
 # the dependency and using that with eclipse-ecj to build this version.
 
 pkgname=gcc-gcj
-pkgver=4.1.2
-pkgrel=5
+pkgver=4.2.0
+pkgrel=1
 pkgdesc="GNU Java Environment"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
 url="http://gcc.gnu.org"
-depends=('gcc>=4.1.2-4' 'gtk2' 'file' 'libsm' 'libxtst' 'alsa-lib' 'eclipse-ecj>=3.2.2-2')
+depends=('gcc>=4.2.0' 'gtk2' 'file' 'libsm' 'libxtst' 'alsa-lib' 'eclipse-ecj>=3.2.2-2')
 makedepends=('texinfo' 'pkgconfig' 'xulrunner')
 options=('nolibtool')
-source=(ftp://gcc.gnu.org/pub/gcc/snapshots/4.1-20070423/gcc-{core,g++}-4.1-20070423.tar.bz2
-        http://www.archlinux.org/~jgc/gcc/gcc-ecj-20070423.tar.bz2
+_javasnap=4.3-20070511
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2
+	http://www.archlinux.org/~jgc/gcc/gcc-ecj-20070516.tar.bz2
 	gcc_pure64.patch
 	libjava-disable-static.dpatch
-	gcc-expandv.dpatch
-	pr26885.dpatch
-	pr26864.dpatch
-	pr27227.dpatch
-	pr26208.dpatch
-	libjava-sjlj.dpatch
-	gcc-dwarf2-h.dpatch
-	pr9861-nojava.dpatch
-	gcc-unwind-r111705.dpatch
-	gcc-unwind-r120406.dpatch
-	gcc-r109242.dpatch
-	gcc-r109581.dpatch
-	gcc-4.1-x86-blended.dpatch
-	gcc-pfrs-2.dpatch)
-md5sums=('00791ac126f6baebecf6c042abbb2afc' '61501742fccce9880cf909c6225edcb3'
-         'a398bdce760d6e680f6365474a85ec69' '1ceaa49e3a1d9f984ecc2893c43f7425'
-         'bef24466abe00c4e655ac074cedf0c29' '4333335a36bc05f35315cbf56313307a'
-         'ab48287bb58ce2c12bb34304b21c2194' 'c0d6a7276e892232f548201ac7a47d06'
-         '118ef1703535be2a926b810b62715bf1' 'cb3b4948d7a6af42249049a61f653b6e'
-         'afe3541abf5ce163223f94ccdbc66e30' 'a7c38a54b1c65f3a1523cef6b5a6905c'
-         '1fd02b887a001bc7e0dfe0fa8d7ee387' 'b883cf2b9b89556a01d1f18f004806ab'
-         '65005005755fdf13237c1a78b99d3c22' '6878d9cc67eb3af719d71779ab1a7349'
-         'e8b866d1fb8fa8ddc3b2c880a53572db' 'f58dc68586323524caef8ab34818a5b2'
-         'c1ad1e1f70d1b410fc905ccc1e21dbb2')
+	libjava-sjlj.dpatch)
 
 build() {
   [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh ]
 
   export MAKEFLAGS="-j1"
-  cd $startdir/src/gcc-4.1-20070423
+  cd $startdir/src/gcc-${pkgver}
   # Don't install libiberty
   sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
   # Don't run fixincludes
@@ -58,20 +36,7 @@
   fi
   chmod +x ${startdir}/src/*.dpatch
   ${startdir}/src/libjava-disable-static.dpatch -patch
-  ${startdir}/src/gcc-expandv.dpatch -patch
-  ${startdir}/src/pr26885.dpatch -patch
-  ${startdir}/src/pr26864.dpatch -patch
-  ${startdir}/src/pr27227.dpatch -patch
-  ${startdir}/src/pr26208.dpatch -patch
   ${startdir}/src/libjava-sjlj.dpatch -patch
-  ${startdir}/src/gcc-dwarf2-h.dpatch -patch
-  ${startdir}/src/pr9861-nojava.dpatch -patch
-  ${startdir}/src/gcc-unwind-r111705.dpatch -patch
-  ${startdir}/src/gcc-unwind-r120406.dpatch -patch
-  ${startdir}/src/gcc-r109242.dpatch -patch
-  ${startdir}/src/gcc-r109581.dpatch -patch
-  ${startdir}/src/gcc-4.1-x86-blended.dpatch -patch
-  ${startdir}/src/gcc-pfrs-2.dpatch -patch
 
   echo ${pkgver} > gcc/BASE-VER
 
@@ -119,11 +84,11 @@
      --enable-java-maintainer-mode --enable-libgcj-multifile \
      --with-ecj-jar=/usr/share/java/eclipse-ecj.jar \
      --enable-plugin --with-system-zlib
-   make all-target-libjava || return 1
+   make bootstrap || return 1
    make DESTDIR=${startdir}/pkg install-target-libjava
 
    cd gcc
-   make DESTDIR=${startdir}/pkg lang.install-normal lang.install-common lang.install-man
+   make DESTDIR=${startdir}/pkg java.install-common java.install-man
 
    install -m755 jc1 ${startdir}/pkg/usr/lib/gcc/${CHOST}/${pkgver}/
    install -m755 jvgenmain ${startdir}/pkg/usr/lib/gcc/${CHOST}/${pkgver}/