Begin updating toolchain

2 files changed, 58 insertions, 74 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 934c982239d0..209665748cb1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,18 @@
 pkgbase = powerpc64-linux-gnu-binutils
-	pkgdesc = A set of programs to assemble and manipulate binary and object files (powerpc64-linux-gnu)
-	pkgver = 2.32
+	pkgdesc = A set of programs to assemble and manipulate binary and object files for the PPC64 target
+	pkgver = 2.39
 	pkgrel = 2
-	url = http://www.gnu.org/software/binutils/
-	arch = i686
+	url = https://www.gnu.org/software/binutils/
 	arch = x86_64
 	license = GPL
-	checkdepends = dejagnu
-	checkdepends = bc
-	depends = glibc
 	depends = zlib
-	options = staticlibs
-	options = !distcc
-	options = !ccache
-	source = http://ftp.gnu.org/gnu/binutils/binutils-2.32.tar.xz
-	source = http://ftp.gnu.org/gnu/binutils/binutils-2.32.tar.xz.sig
+	depends = libelf
+	source = https://ftp.gnu.org/gnu/binutils/binutils-2.39.tar.bz2
+	source = https://ftp.gnu.org/gnu/binutils/binutils-2.39.tar.bz2.sig
 	validpgpkeys = 3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F
-	md5sums = 0d174cdaf85721c5723bf52355be41e6
-	md5sums = SKIP
+	sha1sums = d9028547385694d61d98fb4e2882a2b9c40ce7e9
+	sha1sums = SKIP
+	sha256sums = da24a84fef220102dd24042df06fdea851c2614a5377f86effa28f33b7b16148
+	sha256sums = SKIP
 
 pkgname = powerpc64-linux-gnu-binutils
-
diff --git a/PKGBUILD b/PKGBUILD
index 72b21073785a..fe645ac7618b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,82 +1,71 @@
-# Contributor: Alexander 'hatred' Drozdov <adrozdoff@gmail.com>
-# Contributor: toha257 <toha257@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
-# Contributor: Kevin Mihelich <kevin@archlinuxarm.org>
-# Contributor: Tavian Barnes <tavianator@tavianator.com>
-# Maintainer: Stefan Schmidt <thrimbor.github@gmail.com>
+# Maintainer: Anatol Pomozov <anatol.pomozov@gmail.com>
 
-_target="powerpc64-linux-gnu"
-pkgname=${_target}-binutils
-pkgver=2.32
+_target=powerpc64-linux-gnu
+pkgname=$_target-binutils
+pkgver=2.39
 pkgrel=2
-pkgdesc="A set of programs to assemble and manipulate binary and object files (${_target})"
-arch=(i686 x86_64)
-url='http://www.gnu.org/software/binutils/'
+pkgdesc='A set of programs to assemble and manipulate binary and object files for the PPC64 target'
+arch=(x86_64)
+url='https://www.gnu.org/software/binutils/'
 license=(GPL)
-depends=(glibc zlib)
-checkdepends=(dejagnu bc)
-options=(staticlibs !distcc !ccache)
-source=(http://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz{,.sig})
-validpgpkeys=(3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F)
-md5sums=('0d174cdaf85721c5723bf52355be41e6'
-         'SKIP')
+depends=(zlib libelf)
+source=(https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2{,.sig})
+sha1sums=('d9028547385694d61d98fb4e2882a2b9c40ce7e9'
+          'SKIP')
+sha256sums=('da24a84fef220102dd24042df06fdea851c2614a5377f86effa28f33b7b16148'
+            'SKIP')
+validpgpkeys=('3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F') # Nick Clifton (Chief Binutils Maintainer) <nickc@redhat.com>
 
 prepare() {
-  mkdir -p binutils-build
-
-  #cd binutils-gdb
   cd binutils-$pkgver
-
-  # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS"
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
 }
 
 build() {
-  cd binutils-build
+  cd binutils-$pkgver
 
-  "$srcdir/binutils-$pkgver/configure" \
-      --prefix=/usr \
-      --program-prefix=${_target}- \
-      --with-lib-path=/usr/lib/binutils/${_target} \
-      --with-local-prefix=/usr/lib/${_target} \
-      --with-sysroot=/usr/${_target} \
-      --enable-deterministic-archives \
-      --enable-gold \
-      --enable-ld=default \
-      --enable-lto \
-      --enable-plugins \
-      --enable-relro \
-      --enable-shared \
-      --enable-threads \
-      --disable-gdb \
-      --disable-werror \
-      --with-pic \
-      --with-system-zlib \
-      --disable-sim \
-      --target=${_target} \
-      --host=${CHOST} \
-      --build=${CHOST}
+  if [ "${CARCH}" != "i686" ];
+  then
+    # enabling gold linker at i686 makes the install fail
+    enable_gold='--enable-gold'
+  fi
+  echo $CC
+  echo $CXX
+  ./configure --target=$_target \
+              --with-sysroot=/usr/$_target \
+              --prefix=/usr \
+              --disable-multilib \
+              --with-gnu-as \
+              --with-gnu-ld \
+              --disable-nls \
+              --enable-ld=default \
+              $enable_gold \
+              --enable-plugins \
+              --enable-deterministic-archives
 
-  make configure-host
-  make tooldir=/usr
+  make
 }
 
 check() {
-  cd binutils-build
+  cd binutils-$pkgver
 
   # unset LDFLAGS as testsuite makes assumptions about which ones are active
-  # ignore failures in gold testsuite...
+  # do not abort on errors - manually check log files
   make -k LDFLAGS="" check || true
 }
 
 package() {
-  cd binutils-build
-  make prefix="$pkgdir/usr" tooldir="$pkgdir/usr" install
+  cd binutils-$pkgver
+
+  make DESTDIR="$pkgdir" install
+
+  # Remove file conflicting with host binutils and manpages for MS Windows tools
+  rm -f "$pkgdir"/usr/share/man/man1/$_target-{dlltool,windres,windmc}*
+  rm -f "$pkgdir"/usr/lib/bfd-plugins/libdep.so
+  rm -f "$pkgdir"/usr/etc/gprofng.rc
+  rm -rf "$pkgdir"/usr/include
+  rm -rf "$pkgdir"/usr/lib/gprofng/
 
-  # Remove unwanted files
-  rm -rf "$pkgdir/usr/share"
-  rm -f "$pkgdir/usr/bin/"{ar,as,ld,nm,objdump,ranlib,readelf,strip,objcopy}
-  rm -f "$pkgdir"/usr/lib/ldscripts/elf32*
-  rm -f "$pkgdir"/usr/lib/ldscripts/elf64l*
+  # Remove info documents that conflict with host version
+  rm -rf "$pkgdir"/usr/share/info
 }