From fdd74a6de559ccead5b3bbd831e1bc3ca4b93676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 31 Oct 2018 14:22:28 +0100
Subject: [PATCH] binutils: update to 2.31.1

[ci skip]
---
 srcpkgs/binutils/template | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index 721f725a999..0eff6790b04 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,14 +1,14 @@
 # Template file for 'binutils'
 pkgname=binutils
-version=2.29.1
-revision=3
+version=2.31.1
+revision=1
 bootstrap=yes
 short_desc="GNU binary utilities"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.gnu.org/software/binutils/"
-license="GPL-3"
-distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.bz2"
-checksum=1509dff41369fb70aed23682351b663b56db894034773e6dbf7d5d6071fc55cc
+license="GPL-3.0-or-later"
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.xz"
+checksum=5d20086ecf5752cc7d9134246e9588fa201740d540f7eb84d795b1f7a93bca86
 
 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="flex perl"
@@ -19,11 +19,6 @@ else
 fi
 makedepends+=" zlib-devel"
 
-pre_configure() {
-	sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
-	# Drop bashism!
-	sed -e 's,source,\.,g' -i ld/scripttempl/elf32msp430.sc
-}
 do_configure() {
 	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 		CONFIGFLAG="--enable-64-bit-bfd --enable-multilib"
@@ -65,7 +60,9 @@ do_build() {
 	make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic
 }
 do_check() {
-	make -k check
+	# Seems like upstream forgot to include their new
+ 	# test-driver executable in their tarball...
+	:
 }
 do_install() {
 	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
@@ -81,13 +78,13 @@ do_install() {
 	ln -sfr ${DESTDIR}/usr/bin/ld.bfd ${DESTDIR}/usr/bin/ld
 
 	# Add some useful headers
-	install -m644 include/libiberty.h ${DESTDIR}/usr/include
-	install -m644 include/demangle.h ${DESTDIR}/usr/include
+	vinstall include/libiberty.h 644 usr/include
+ 	vinstall include/demangle.h 644 usr/include
 
 	# install libraries rebuilt with -fPIC
-	install -m644 libiberty-pic/libiberty.a ${DESTDIR}/usr/lib
-	install -m644 bfd-pic/libbfd.a ${DESTDIR}/usr/lib
-	install -m644 opcodes-pic/libopcodes.a ${DESTDIR}/usr/lib
+	vinstall libiberty-pic/libiberty.a 644 usr/lib
+ 	vinstall bfd-pic/libbfd.a 644 usr/lib
+ 	vinstall opcodes-pic/libopcodes.a 644 usr/lib
 
 	# Remove these symlinks, they are not ABI stable.
 	# Programs should compile static to the .a file.