gcc-gcj

1 files changed, 50 insertions, 22 deletions

diff --git a/pcr/gcc-gcj/PKGBUILD b/pcr/gcc-gcj/PKGBUILD
index f50e496bf..2ae2090ae 100644
--- a/pcr/gcc-gcj/PKGBUILD
+++ b/pcr/gcc-gcj/PKGBUILD
@@ -1,43 +1,42 @@
-# Contributor (Arch): Renan Manola <rmanola@gmail.com>
-# Contributor (Arch): Stefan Husmann <stefan-husmann@t-online.de>
+# Contributor: Renan Manola <rmanola@gmail.com>
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+# Contributor: Joey Dumont <joey.dumont@gmail.com>
+# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@hackers.camp>
 # Based on a modified version of the gcc PKGBUILD
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
 
 pkgname=gcc-gcj
-pkgver=4.7.2
-pkgrel=2
+pkgver=4.9.0
+pkgrel=1
 pkgdesc="The GNU Compiler for Java"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
 url="http://gcc.gnu.org"
-depends=("gcc=$pkgver" 'gtk2' 'file' 'zip' 'libsm' 'libxtst' 'alsa-lib' 'libart-lgpl')
-makedepends=('binutils>=2.20.1' 'mpfr>=2.4.2-2' 'cloog>=0.16.2-1' 'elfutils'
-             'libmpc>=0.8.2-2' 'jack')
+depends=('gtk2' 'libxtst' 'alsa-lib' 'cloog>=0.16.2-1' 'libmpc>=0.8.2-2' 'classpath')
+makedepends=('mpfr>=2.4.2-2' 'elfutils' 'jack' 'zip' 'gcc' 'libart-lgpl')
+optdepends=('python2: for running /usr/bin/aot-compile'
+  'java-environment: for runnig some jars')
 options=('!libtool')
 install=$pkgname.install
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 libjava-sjlj.dpatch gcc_pure64.patch)
-md5sums=('cc308a0891e778cfda7a151ab8a6e762'
-         'afe3541abf5ce163223f94ccdbc66e30'
-         'ced48436c1b3c981d721a829f1094de1')
+source=("ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2")
 
 build() {
-  cd ${srcdir}/gcc-${pkgver}
+  cd "$srcdir"/gcc-${pkgver}
   
   # Do not install libiberty
   sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
 
   # Do not run fixincludes
   sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
-  chmod +x ${srcdir}/*.dpatch
-  ${srcdir}/libjava-sjlj.dpatch -patch
+  
+  # Arch Linux installs x86_64 libraries /lib
+  [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
+  
+  # Arch uses python version 3 as default python 
+  sed -i '1s+python+python2+' libjava/contrib/aot-compile.in
 
   echo ${pkgver} > gcc/BASE-VER
-
   [ -d build ] || mkdir build
-  if [ "${CARCH}" = "x86_64" ]; then
-    patch -p1 < $srcdir/gcc_pure64.patch
-  fi
+
   cd build
 
   ../configure --prefix=/usr --enable-shared --enable-languages=java \
@@ -46,11 +45,12 @@ build() {
       --libexecdir=/usr/lib --enable-clocale=gnu --disable-libstdcxx-pch \
       --with-tune=generic --enable-java-awt=gtk --with-java-home="$JAVA_HOME" \
       --enable-libgcj-multifile --disable-plugin --with-system-zlib
+  CPPFLAGS=
   make
 }
 
 package() {
-  cd ${srcdir}/gcc-${pkgver}/build
+  cd "$srcdir"/gcc-${pkgver}/build
   make -j1 DESTDIR=${pkgdir} install-target-libjava
 
   cd gcc
@@ -69,8 +69,36 @@ package() {
   rm -f ${pkgdir}/usr/man/man1/g++.*
   # Rename two files to not conflict to classpath
   mv ${pkgdir}/usr/share/info/cp-tools.info ${pkgdir}/usr/share/info/cp-tools-gcj.info
-  rm ${pkgdir}/usr/share/info/dir
   mv ${pkgdir}/usr/share/man/man1/gjdoc.1 ${pkgdir}/usr/share/man/man1/gjdoc.gcj.1
+  cd $pkgdir
+  [[ $CARCH == "x86_64" ]] && rm usr/lib/libgcc_s.so usr/lib/libgcc_s.so.1 \
+    usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/crtbegin.o \
+    usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/crtbeginS.o \
+    usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/crtbeginT.o \
+    usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/crtend.o \
+    usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/crtendS.o \
+    usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/crtfastmath.o \
+    usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/crtprec32.o \
+    usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/crtprec64.o \
+    usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/crtprec80.o \
+    usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/include/unwind.h \
+    usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/libgcc.a \
+    usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/libgcc_eh.a \
+    usr/lib/gcc/x86_64-unknown-linux-gnu/$pkgver/libgcov.a 
+  [[ $CARCH == "i686" ]] && rm usr/lib/libgcc_s.so usr/lib/libgcc_s.so.1 \
+    usr/lib/gcc/i686-pc-linux-gnu/$pkgver/crtbegin.o \
+    usr/lib/gcc/i686-pc-linux-gnu/$pkgver/crtbeginS.o \
+    usr/lib/gcc/i686-pc-linux-gnu/$pkgver/crtbeginT.o \
+    usr/lib/gcc/i686-pc-linux-gnu/$pkgver/crtend.o \
+    usr/lib/gcc/i686-pc-linux-gnu/$pkgver/crtendS.o \
+    usr/lib/gcc/i686-pc-linux-gnu/$pkgver/crtfastmath.o \
+    usr/lib/gcc/i686-pc-linux-gnu/$pkgver/crtprec32.o \
+    usr/lib/gcc/i686-pc-linux-gnu/$pkgver/crtprec64.o \
+    usr/lib/gcc/i686-pc-linux-gnu/$pkgver/crtprec80.o \
+    usr/lib/gcc/i686-pc-linux-gnu/$pkgver/include/unwind.h \
+    usr/lib/gcc/i686-pc-linux-gnu/$pkgver/libgcc.a \
+    usr/lib/gcc/i686-pc-linux-gnu/$pkgver/libgcc_eh.a \
+    usr/lib/gcc/i686-pc-linux-gnu/$pkgver/libgcov.a 
 
   find ${pkgdir}/usr/lib -type f -name '*.so.*' -exec strip --strip-unneeded {} \;