update cross-binutils

1 files changed, 26 insertions, 87 deletions

diff --git a/cross/cross-binutils/PKGBUILD b/cross/cross-binutils/PKGBUILD
index f7228e595..59a882d90 100644
--- a/cross/cross-binutils/PKGBUILD
+++ b/cross/cross-binutils/PKGBUILD
@@ -1,5 +1,5 @@
-# Maintainer (Arch): Allan McRae <allan@archlinux.org>
 # Maintainer: Márcio Silva (Parabola) <coadde@parabola.nu>
+# Maintainer (Arch): Allan McRae <allan@archlinux.org>
 
 # toolchain build order: {kernel}-api-headers->glibc->binutils->gcc->binutils->glibc
 
@@ -11,7 +11,7 @@
 # ->binutils(target system)->gcc(target system)->binutils(target system)
 # ->glibc(target system)
 
-# NOTE: libtool requires rebuilt with each new gcc version
+# build from head of release branch as bug fix releases are rare
 
 #--------------------------------------------------------------------------------
 #  cross-compile table
@@ -122,92 +122,38 @@ fi
 
 _pkgname=binutils
 pkgname=$_target-$_pkgname
-pkgver=2.24
-pkgrel=8
+pkgver=2.25
+pkgrel=5
+_commit=69352378
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
-arch=('i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64' 'armv7h' 'aarch64' 'mips64el')
 url="http://www.gnu.org/software/$_pkgname/"
 license=('GPL')
 groups=('cross-devel')
 depends=('glibc>=2.20' 'zlib')
+makedepends=('git')
 checkdepends=('dejagnu' 'bc')
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
 options=('staticlibs' '!distcc' '!ccache')
 install=$_pkgname.install
-source=(ftp://ftp.gnu.org/gnu/$_pkgname/$_pkgname-${pkgver}.tar.bz2{,.sig}
-        $_pkgname-$pkgver-lto-testsuite.patch
-        $_pkgname-$pkgver-gold-testsuite-plugin.patch
-        $_pkgname-$pkgver-shared-pie.patch
-        $_pkgname-$pkgver-CVE-2014-8484.patch
-        $_pkgname-$pkgver-CVE-2014-8485.patch
-        $_pkgname-$pkgver-CVE-2014-8501.patch
-        $_pkgname-$pkgver-CVE-2014-8502.patch
-        $_pkgname-$pkgver-CVE-2014-8503.patch
-        $_pkgname-$pkgver-CVE-2014-8504.patch
-        $_pkgname-$pkgver-CVE-2014-8737.patch
-        $_pkgname-$pkgver-CVE-2014-8738.patch
-        $_pkgname-$pkgver-strings-all-default.patch
+#source=(ftp://ftp.gnu.org/gnu/$_pkgname/$_pkgname-${pkgver}.tar.bz2{,.sig})
+source=(git://sourceware.org/git/$_pkgname-gdb.git#commit=${_commit}
+        $_pkgname-e9c1bdad.patch
         $_pkgname-xtensa.patch::https://raw.githubusercontent.com/qca/open-ath9k-htc-firmware/1.3.2/local/patches/$_pkgname.patch)
-md5sums=('e0f71a7b2ddab0f8612336ac81d9636b'
-         'SKIP'
-         'e68a1f221545f082baa5bd417cd077af'
-         'e46bbb03abaa5db58c12247644dc4857'
-         'ec59461c4febab9cfe1c1ef33326bc50'
-         '125d8ce675ced84814d5f068106dbaa3'
-         '6923e5279a84cb7134b07e2cf6686434'
-         '4c590dc70829d8f4fc190f0fe7e3add8'
-         '64efddd24d5628437cc457b468df8de3'
-         '70540e2c6418a54ad88ab9c6b988d075'
-         'acce1f1d28db6bdb84b430a05f331366'
-         '12fb3e860203a06b5d1f4b023c06dcec'
-         'd35b0ccb79d565757821b3e0206f3873'
-         '99445d528110543d88b59a1ec7677592'
+md5sums=('SKIP'
+         'eb3aceaab8ed26e06d505f82beb30f8f'
          '7077126d96e9a755a0eaddb5505efe68')
-validpgpkeys=('EAF1C276A747E9ED86210CBAC3126D3B4AE55E93')
+#validpgpkeys=('EAF1C276A747E9ED86210CBAC3126D3B4AE55E93')
 
 prepare() {
-  cd ${srcdir}/$_pkgname-${pkgver}
+  #cd ${srcdir}/$_pkgname-${pkgver}
+  cd ${srcdir}/$_pkgname-gdb
+
+  # https://sourceware.org/bugzilla/show_bug.cgi?id=16992
+  patch -p1 -i ${srcdir}/$_pkgname-e9c1bdad.patch
 
   # 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/$_pkgname-$pkgver-lto-testsuite.patch
-
-  # fix gold testsuite with gcc-4.9 - commit ae447ddd
-  patch -p1 -i $srcdir/$_pkgname-$pkgver-gold-testsuite-plugin.patch
-
-  # fix issues with -static -fPIE -pie - commit 4199e3b8
-  patch -p1 -i $srcdir/$_pkgname-$pkgver-shared-pie.patch
-
-  # CVE-2014-8484 - backport of commit bd25671c
-  patch -p1 -i $srcdir/$_pkgname-$pkgver-CVE-2014-8484.patch
-
-  # CVE-2014-8485 - commit 493a3386
-  patch -p1 -i $srcdir/$_pkgname-$pkgver-CVE-2014-8485.patch
-  
-  # CVE-2014-8501 - commit 7e1e1988
-  patch -p1 -i $srcdir/$_pkgname-$pkgver-CVE-2014-8501.patch
-
-  # CVE-2014-8502 - commits bf67003b and 5a4b0ccc
-  patch -p1 -i $srcdir/$_pkgname-$pkgver-CVE-2014-8502.patch
-
-  # CVE-2014-8503 - commit 0102ea8c
-  patch -p1 -i $srcdir/$_pkgname-$pkgver-CVE-2014-8503.patch
-
-  # CVE-2014-8504 - commit 708d7d0d
-  patch -p1 -i $srcdir/$_pkgname-$pkgver-CVE-2014-8504.patch
-
-  # CVE-2014-8737 - commit dd9b91de
-  patch -p1 -i $srcdir/$_pkgname-$pkgver-CVE-2014-8737.patch
-
-  # CVE-2014-8738 - commit bb0d8671
-  patch -p1 -i $srcdir/$_pkgname-$pkgver-CVE-2014-8738.patch
-
-  # strings -a default - commit 7fac9594 (fedora backport)
-  patch -p0 -i $srcdir/$_pkgname-$pkgver-strings-all-default.patch
-
   # open-ath9k-htc-firmware patch on xtensa-unknown-elf
   [[ $_target == xtensa-unknown-elf ]] && patch -p1 -i ${srcdir}/$_pkgname-xtensa.patch
 
@@ -217,12 +163,14 @@ prepare() {
 build() {
   cd ${srcdir}/$_pkgname-build
 
-  ${srcdir}/$_pkgname-${pkgver}/configure --prefix=/usr \
+  #${srcdir}/$_pkgname-${pkgver}/configure --prefix=/usr \
+  ${srcdir}/$_pkgname-gdb/configure --prefix=/usr \
     --with-lib-path=/usr/lib:/usr/local/lib \
     --with-bugurl=https://labs.parabola.nu/ \
-    --enable-threads --enable-shared --with-pic \
+    --enable-threads --with-pic \
     --enable-ld=default --enable-gold --enable-plugins \
-    --disable-werror --target=$_target --program-prefix=$_target-
+    --disable-werror --disable-gdb --disable-nls \
+    --target=$_target --with-sysroot=/usr/$_target
 
   # check the host environment and makes sure all the necessary tools are available
   make configure-host
@@ -240,17 +188,8 @@ check() {
 
 package() {
   cd ${srcdir}/$_pkgname-build
-  make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
+  make prefix=${pkgdir}/usr install
 
-  # link files
-  for bin in addr2line c++filt dwp elfedit gprof ld{,.bfd,.gold} readelf size strings; do
-    ln -s $_target-$bin $pkgdir/usr/bin/$bin; done
-  if [[ $CHOST != $_target ]]; then
-    for include in $(ls -1 $pkgdir/usr/$CHOST/$_target/include); do
-      install -d $pkgdir/usr/include && ln -s $include $pkgdir/usr/include/$include; done
-    for lib in $(ls -1 $pkgdir/usr/$CHOST/$_target/lib); do
-      ln -s $lib $pkgdir/usr/lib/$lib; done
-  fi
-  for man in $(ls -1 $pkgdir/usr/share/man/man1); do
-    ln -s $man $pkgdir/usr/share/man/man1/${man#$_target-}; done
+  # Remove info documents that conflict with host version
+  rm -rf ${pkgdir}/usr/share/info
 }