update cross-binutils

1 files changed, 25 insertions, 9 deletions

diff --git a/cross/cross-binutils/PKGBUILD b/cross/cross-binutils/PKGBUILD
index 284e0ef8e..837ad0e6c 100644
--- a/cross/cross-binutils/PKGBUILD
+++ b/cross/cross-binutils/PKGBUILD
@@ -90,13 +90,13 @@
 # Hardware architecture:
 
 # options: "same", "mips64el", "x86_64", "i686" or "xtensa"
-_arch_target=mips64el
+_arch_target=xtensa
 
 # OS target:
 
 # system: <os> or <kernel>-<os>
 # options: "gnu", "linux-gnu", "kfreebsd-gnu" or "elf"
-_os_target=kfreebsd-gnu
+_os_target=elf
 
 #--------------------------------------------------------------------------------
 # variables
@@ -125,20 +125,27 @@ fi
 _pkgname=binutils
 pkgname=$_target-$_pkgname
 pkgver=2.24
-pkgrel=2
+pkgrel=7
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/$_pkgname/"
 license=('GPL')
 groups=('cross-devel')
-depends=('glibc>=2.19' 'zlib')
+depends=('glibc>=2.20' 'zlib')
 checkdepends=('dejagnu' 'bc')
 provides=("$_pkgname=$pkgver")
 conflicts=("$_pkgname")
 install=$_pkgname.install
-source=(ftp://ftp.gnu.org/gnu/$_pkgname/$_pkgname-${pkgver}.tar.bz2{,.sig})
+source=(ftp://ftp.gnu.org/gnu/$_pkgname/$_pkgname-${pkgver}.tar.bz2{,.sig}
+        binutils-2.24-lto-testsuite.patch
+        binutils-2.24-gold-testsuite-plugin.patch
+        binutils-2.24-shared-pie.patch)
 md5sums=('e0f71a7b2ddab0f8612336ac81d9636b'
-         'SKIP')
+         'SKIP'
+         'e68a1f221545f082baa5bd417cd077af'
+         'e46bbb03abaa5db58c12247644dc4857'
+         'ec59461c4febab9cfe1c1ef33326bc50')
+validpgpkeys=('EAF1C276A747E9ED86210CBAC3126D3B4AE55E93')
 
 prepare() {
   cd ${srcdir}/$_pkgname-${pkgver}
@@ -146,6 +153,15 @@ prepare() {
   # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS"
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
 
+  # fix lto testsuite with gcc-4.9 - commits b35d44f1 and 37a6ac44
+  patch -p1 -i $srcdir/binutils-2.24-lto-testsuite.patch
+
+  # fix gold testsuite with gcc-4.9 - commit ae447ddd
+  patch -p1 -i $srcdir/binutils-2.24-gold-testsuite-plugin.patch
+
+  # fix issues with -static -fPIE -pie - commit 4199e3b8
+  patch -p1 -i $srcdir/binutils-2.24-shared-pie.patch
+
   mkdir ${srcdir}/$_pkgname-build
 }
 
@@ -155,7 +171,7 @@ build() {
   ${srcdir}/$_pkgname-${pkgver}/configure --prefix=/usr \
     --with-lib-path=/usr/lib:/usr/local/lib \
     --with-bugurl=https://labs.parabola.nu/ \
-    --enable-threads --enable-shared \
+    --enable-threads --enable-shared --with-pic \
     --enable-ld=default --enable-gold --enable-plugins \
     --disable-werror --target=$_target --program-prefix=$_target-
 
@@ -169,8 +185,8 @@ check() {
   cd ${srcdir}/$_pkgname-build
   
   # unset LDFLAGS as testsuite makes assumptions about which ones are active
-  # do not abort on errors - manually check log files
-  make LDFLAGS="" -k check || true
+  # ignore failures in gold testsuite...
+  make -k LDFLAGS="" check
 }
 
 package() {