Thu Apr 24 03:25:33 UTC 2014

3 files changed, 17 insertions, 18 deletions

diff --git a/community/arm-none-eabi-gcc/PKGBUILD b/community/arm-none-eabi-gcc/PKGBUILD
index 87c353a77..07e167695 100644
--- a/community/arm-none-eabi-gcc/PKGBUILD
+++ b/community/arm-none-eabi-gcc/PKGBUILD
@@ -2,8 +2,8 @@
 
 _target=arm-none-eabi
 pkgname=$_target-gcc
-pkgver=4.8.2
-pkgrel=8
+pkgver=4.9.0
+pkgrel=1
 _newlibver=2.1.0
 pkgdesc='The GNU Compiler Collection - cross compiler for ARM EABI (bare-metal) target'
 arch=(i686 x86_64)
@@ -15,13 +15,13 @@ makedepends=($_target-binutils gmp mpfr)
 options=(!emptydirs !strip staticlibs)
 source=(ftp://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.bz2
         ftp://sourceware.org/pub/newlib/newlib-$_newlibver.tar.gz
-        gcc-$pkgver-multilib.patch
-        gcc-$pkgver-no-exceptions.patch
+        gcc-multilib.patch
+        gcc-no-exceptions.patch
         libgloss-configure-fix.patch)
-sha256sums=('09dc2276c73424bbbfda1dbddc62bbbf900c9f185acf7f3e1d773ce2d7e3cdc8'
+sha256sums=('b9b047a97bade9c1c89970bc8e211ff57b7b8998a1730a80a653d329f8ed1257'
             '3e4d5ab9f0508942b6231b8ade4f8e5048cf92c96ed574c2bd6bd3320a599a48'
-            '4edd875c89391cbf5c2b57587a51da0dfda54ca0c711a85e9c301f03083e4189'
-            '649eb3b443e975d40ca61128ba715d1e3a29716e1e45a52c661ac0dba3c2099d'
+            '998d1face674cc8d1af5bf28ded15caaaa18936a28f278123448f29555a07775'
+            '7f59b28475aa2018a7edfb81ea81444a6eb098fd3847d8e605809ae6fbeabde5'
             'eac96c034d3d7d16080d9aef4749e4eda493563a3348e6a06f08e8a330b027ba')
 
 prepare() {
@@ -30,16 +30,16 @@ prepare() {
   patch -Np0 -i "$srcdir/libgloss-configure-fix.patch"
   autoreconf
 
-  cd "$srcdir"
-  patch -Np0 -i gcc-$pkgver-multilib.patch
-  patch -Np0 -i gcc-$pkgver-no-exceptions.patch
+  cd "$srcdir/gcc-$pkgver"
+  patch -Np0 -i "$srcdir"/gcc-multilib.patch
+  patch -Np0 -i "$srcdir"/gcc-no-exceptions.patch
 
   # Move newlib and libgloss to gcc source directory
-  mv newlib-$_newlibver/newlib   gcc-$pkgver
-  mv newlib-$_newlibver/libgloss gcc-$pkgver
+  mv "$srcdir"/newlib-$_newlibver/newlib "$srcdir/gcc-$pkgver"
+  mv "$srcdir"/newlib-$_newlibver/libgloss "$srcdir/gcc-$pkgver"
 
   # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
-  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" gcc-$pkgver/{libiberty,gcc}/configure
+  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" "$srcdir"/gcc-$pkgver/{libiberty,gcc}/configure
 }
 
 build() {
@@ -91,7 +91,6 @@ package() {
   find "$pkgdir" -executable -type f -exec /usr/bin/strip --strip-debug '{}' \;
 
   # Remove files that conflict with host gcc package
-  rm "$pkgdir"/usr/lib/libiberty.a
   rm -r "$pkgdir"/usr/share/man/man7
   rm -r "$pkgdir"/usr/share/info
   rm -r "$pkgdir"/usr/share/gcc-$pkgver
diff --git a/community/arm-none-eabi-gcc/gcc-4.8.2-multilib.patch b/community/arm-none-eabi-gcc/gcc-multilib.patch
index c75aa158b..026a87ff9 100644
--- a/community/arm-none-eabi-gcc/gcc-4.8.2-multilib.patch
+++ b/community/arm-none-eabi-gcc/gcc-multilib.patch
@@ -1,5 +1,5 @@
---- gcc-4.8.2/gcc/config/arm/t-arm-elf.orig	2013-01-10 21:38:27.000000000 +0100
-+++ gcc-4.8.2/gcc/config/arm/t-arm-elf	2013-10-17 08:14:29.237001796 +0200
+--- gcc/config/arm/t-arm-elf.orig	2013-01-10 21:38:27.000000000 +0100
++++ gcc/config/arm/t-arm-elf	2013-10-17 08:14:29.237001796 +0200
 @@ -18,73 +18,26 @@
  
  MULTILIB_OPTIONS     = marm/mthumb
diff --git a/community/arm-none-eabi-gcc/gcc-4.8.2-no-exceptions.patch b/community/arm-none-eabi-gcc/gcc-no-exceptions.patch
index 6291ee43b..2abb0ce92 100644
--- a/community/arm-none-eabi-gcc/gcc-4.8.2-no-exceptions.patch
+++ b/community/arm-none-eabi-gcc/gcc-no-exceptions.patch
@@ -1,5 +1,5 @@
---- gcc-4.8.2/libgcc/Makefile.in.orig	2013-02-04 20:06:20.000000000 +0100
-+++ gcc-4.8.2/libgcc/Makefile.in	2013-10-17 08:05:38.314091932 +0200
+--- libgcc/Makefile.in.orig	2013-02-04 20:06:20.000000000 +0100
++++ libgcc/Makefile.in	2013-10-17 08:05:38.314091932 +0200
 @@ -492,7 +492,7 @@
  ifeq ($(LIB2_DIVMOD_EXCEPTION_FLAGS),)
  # Provide default flags for compiling divmod functions, if they haven't been