Sun Apr 15 00:01:28 UTC 2012

1 files changed, 33 insertions, 23 deletions

diff --git a/community/avr-gcc/PKGBUILD b/community/avr-gcc/PKGBUILD
index eff6d6b91..e09943802 100644
--- a/community/avr-gcc/PKGBUILD
+++ b/community/avr-gcc/PKGBUILD
@@ -1,60 +1,70 @@
-# $Id: PKGBUILD 67673 2012-03-13 17:43:08Z schuay $
+# $Id: PKGBUILD 69308 2012-04-13 08:26:08Z schuay $
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: danst0 <danst0@west.de>
 
 pkgname=avr-gcc
-pkgver=4.6.3
+_pkgname=gcc
+pkgver=4.7.0
 pkgrel=1
 pkgdesc="The GNU avr Compiler Collection"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'custom')
 url="http://gcc.gnu.org/"
-depends=('binutils-avr>=2.22' 'cloog' 'ppl' 'gcc-libs>=4.6.0' 'libmpc')
+depends=('avr-binutils>=2.22-3' 'cloog' 'ppl' 'gcc-libs>=4.7.0' 'libmpc')
 provides=("gcc-avr=$pkgver")
 replaces=('gcc-avr')
-options=('!ccache' '!distcc' '!emptydirs' '!libtool' '!strip')
-source=(http://ftp.gnu.org/gnu/gcc/${pkgname/avr-}-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2)
+options=('!libtool' '!emptydirs' '!libtool' '!strip')
+source=(http://ftp.gnu.org/gnu/gcc/${_pkgname}-${pkgver}/gcc-${pkgver}.tar.bz2)
+
+_basedir=${srcdir}/${_pkgname}-${pkgver}
 
 build() {
+    # default CFLAGS lead to issues later on when configure 
+    # calls avr-gcc with -march set.
     export CFLAGS="-O2 -pipe"
     export CXXFLAGS="-O2 -pipe"
 
-    cd "${srcdir}/${pkgname/avr-}-${pkgver}" 
+    cd ${_basedir} 
 
-    mkdir build
-    cd build
-    ../configure --disable-libssp \
-                --disable-nls \
-                --enable-languages=c,c++ \
-                --infodir=/usr/share/info \
+    # Do not install libiberty
+    sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
+
+    echo ${pkgver} > gcc/BASE-VER
+
+    cd ${srcdir}
+    mkdir gcc-build && cd gcc-build
+
+    ${_basedir}/configure \
+                --prefix=/usr \
                 --libdir=/usr/lib \
                 --libexecdir=/usr/lib \
                 --mandir=/usr/share/man \
-                --prefix=/usr \
+                --infodir=/usr/share/info \
+                --enable-languages=c,c++ \
+                --disable-libssp \
+                --disable-nls \
                 --target=avr \
-                --with-gnu-as \
-                --with-gnu-ld \
                 --with-as=/usr/bin/avr-as \
-                --with-ld=/usr/bin/avr-ld
+                --with-ld=/usr/bin/avr-ld \
+                --with-gnu-as \
+                --with-gnu-ld
 
     make
 }
 
 package() {
-    cd "${srcdir}/${pkgname/avr-}-${pkgver}"
+    cd ${srcdir}/gcc-build
 
-    cd build
     make -j1 DESTDIR=${pkgdir} install
 
-    install -Dm644 "${srcdir}/${pkgname/avr-}-${pkgver}/COPYING.RUNTIME" \
-        "${pkgdir}/usr/share/licenses/${pkgname}/RUNTIME.LIBRARY.EXCEPTION"
+      # Install Runtime Library Exception
+    install -Dm644 ${_basedir}/COPYING.RUNTIME \
+        ${pkgdir}/usr/share/licenses/${pkgname}/RUNTIME.LIBRARY.EXCEPTION
 
-    rm -f ${pkgdir}/usr/lib/libiberty.a
     rm -rf ${pkgdir}/usr/share/man/man7
     rm -rf ${pkgdir}/usr/share/info
 }
 
-md5sums=('766091220c6a14fcaa2c06dd573e3758'
-         '37515158a0fb3d0800ec41a08c05e69e')
+md5sums=('2a0f1d99fda235c29d40b561f81d9a77')