Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1cf1f17821d25446826516e53fda81c147196117

commit 1cf1f17821d25446826516e53fda81c147196117
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Sat Dec 3 14:58:55 2011 +0100

gcc-4.6.2-2-i686

- ecj is no longer optional for gcj
- closes #4638

diff --git a/source/devel/gcc/FrugalBuild b/source/devel/gcc/FrugalBuild
index b64366a..aaac329 100644
--- a/source/devel/gcc/FrugalBuild
+++ b/source/devel/gcc/FrugalBuild
@@ -9,7 +9,6 @@ USE_ADA=${USE_ADA:-"$USE_LANGS"}
USE_CXX=${USE_CXX:-"$USE_LANGS"}
USE_FORTRAN=${USE_FORTRAN:-"$USE_LANGS"}
USE_JAVA=${USE_JAVA:-"$USE_LANGS"}
-USE_ECJ=${USE_ECJ:-"n"}
USE_OBJC=${USE_OBJC:-"$USE_LANGS"}

# Activate required langage
@@ -18,7 +17,7 @@ Fuse $USE_OBJC && USE_CXX="y"

pkgname=gcc
pkgver=4.6.2
-pkgrel=1
+pkgrel=2
pkgdesc="The GNU Compiler Collection"
url="http://gcc.gnu.org";
depends=('binutils>=2.18.50.0.8-3' 'glibc>=2.8-2' 'libelf' 'libmpc>=0.8.2-3')
@@ -65,19 +64,14 @@ if Fuse $USE_JAVA; then
subpkgs=("${subpkgs[@]}" 'libgcj' 'libgcj-awt' 'gcc-gcj')
subdescs=("${subdescs[@]}" 'Java runtime library for gcc' 'AWT peer libraries 
for libgcj' 'Java support for GCC')
subdepends=("${subdepends[@]}" 'libgcc zlib alsa-lib' \
-           'libgcj libart_lgpl gtk+2>=2.20.1-1 libxml2 freetype2 libice 
libxtst libxau libxdmcp libxdamage libstdc++')
-       if Fuse $USE_ECJ; then
-               subdepends=("${subdepends[@]}" "libgcj zlib ecj libmpc gcc-g++")
-       else
-               subdepends=("${subdepends[@]}" "libgcj zlib libmpc gcc-g++")
-       fi
+           'libgcj libart_lgpl gtk+2>=2.20.1-1 libxml2 freetype2 libice 
libxtst libxau libxdmcp libxdamage libstdc++' \
+           'libgcj zlib ecj libmpc gcc-g++')
subbackup=("${subbackup[@]}" "usr/lib/gcj-$gccver/classmap.db" '' '')
subgroups=("${subgroups[@]}" 'lib' 'xlib' 'devel-extra')
subreplaces=("${subreplaces[@]}" '' '' 'gjdoc')
makedepends=("${makedepends[@]}" 'libxtst' 'zip' 'xulrunner' \
'libxml2' 'freetype2' 'libice' 'libxtst' 'libxau' 'libxdmcp' \
-               'libxdamage' 'alsa-lib' 'fastjar>=0.95' 'antlr')
-       Fuse $USE_ECJ && makedepends=("${makedepends[@]}" 'ecj')
+               'libxdamage' 'alsa-lib' 'fastjar>=0.95' 'antlr' 'ecj')
fi
if Fuse $USE_OBJC; then
subpkgs=("${subpkgs[@]}" 'libobjc' 'gcc-objc' 'gcc-objc++')
@@ -132,8 +126,6 @@ build()
--enable-gtk-cairo \
--disable-libjava-multilib \
--enable-hash-synchronization"
-               Fuse $USE_ECJ && Fconfopts="$Fconfopts --with-ecj \
-               --with-ecj-jar=/usr/share/java/eclipse-ecj.jar"
fi
if Fuse $USE_CXX; then
langlist="$langlist,c++"
@@ -229,6 +221,11 @@ build()
if Fuse $USE_JAVA; then
Fln ../lib/gcc/$CHOST/$gccver/include/jni.h /usr/include/
Fln ../lib/gcc/$CHOST/$gccver/include/jni_md.h /usr/include/
+               cat > ecj1 <<EOF
+#!/bin/sh
+exec gij -cp /usr/share/java/eclipse-ecj.jar 
org.eclipse.jdt.internal.compiler.batch.GCCMain "\$@"
+EOF
+               Fexerel /usr/libexec/gcc/$CHOST/$gccver/ecj1
fi

Fuse $USE_FORTRAN && Fln gfortran /usr/bin/f95
@@ -294,8 +291,7 @@ build()
Fsplit gcc-gcj usr/bin/{gcj,$CHOST-gcj,gcjh,gjavah,jcf-dump}
Fsplit gcc-gcj usr/share/man/man1/{gcj,gcjh,gjavah,jcf-dump}.1*
Fsplit gcc-gcj usr/share/info/{cp-tools.info,gcj*}
-               Fsplit gcc-gcj usr/libexec/gcc/$CHOST/$gccver/{jc1,jvgenmain}
-               Fuse $USE_ECJ && Fsplit gcc-gcj 
usr/libexec/gcc/$CHOST/$gccver/ecj1
+               Fsplit gcc-gcj 
usr/libexec/gcc/$CHOST/$gccver/{jc1,ecj1,jvgenmain}
Fsplit gcc-gcj usr/bin/aot-compile
Fsplit gcc-gcj usr/share/man/man1/aot-compile.1
Fsplit gcc-gcj usr/share/gcc-$pkgver/python/libjava
diff --git a/source/devel/gcc/gcc.key b/source/devel/gcc/gcc.key
new file mode 100644
index 0000000..7a72322
--- /dev/null
+++ b/source/devel/gcc/gcc.key
@@ -0,0 +1,54 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+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
+=vMVe
+-----END PGP PUBLIC KEY BLOCK-----
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to