Bump to 2.34-5

4 files changed, 14 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 954f5777997e..cd5ef441a8ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = arm-linux-gnueabihf-binutils
 	pkgdesc = A set of programs to assemble and manipulate binary and object files (arm-linux-gnueabihf)
 	pkgver = 2.34
-	pkgrel = 3
+	pkgrel = 5
 	url = https://www.gnu.org/software/binutils/
 	arch = i686
 	arch = x86_64
@@ -15,11 +15,11 @@ pkgbase = arm-linux-gnueabihf-binutils
 	options = !ccache
 	source = https://ftp.gnu.org/gnu/binutils/binutils-2.34.tar.xz
 	source = https://ftp.gnu.org/gnu/binutils/binutils-2.34.tar.xz.sig
-	source = binutils-a72427b1ae01304da0b5170e1e53f68c6d46c1de.patch.xz
+	source = binutils-cb5f6a3e146cc70bc2d864989386df80acec5d3e.patch.xz
 	validpgpkeys = 3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F
-	md5sums = 664ec3a2df7805ed3464639aaae332d6
-	md5sums = SKIP
-	md5sums = f121a3bee2e223786caa5776863d0dcf
+	sha256sums = f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952
+	sha256sums = SKIP
+	sha256sums = e2115d42efde1b6e254dc21c37afd2f948631d2396a7615e03331299e3652dde
 
 pkgname = arm-linux-gnueabihf-binutils
 
diff --git a/PKGBUILD b/PKGBUILD
index 3c98129a34ef..08064ccf2568 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 _target="arm-linux-gnueabihf"
 pkgname=${_target}-binutils
 pkgver=2.34
-pkgrel=3
+pkgrel=5
 pkgdesc="A set of programs to assemble and manipulate binary and object files (${_target})"
 arch=(i686 x86_64)
 url='https://www.gnu.org/software/binutils/'
@@ -18,11 +18,11 @@ depends=(glibc zlib elfutils)
 makedepends=('elfutils')
 options=(staticlibs !distcc !ccache)
 source=(https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.xz{,.sig}
-        binutils-a72427b1ae01304da0b5170e1e53f68c6d46c1de.patch.xz)
+        binutils-cb5f6a3e146cc70bc2d864989386df80acec5d3e.patch.xz)
+sha256sums=('f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952'
+            'SKIP'
+            'e2115d42efde1b6e254dc21c37afd2f948631d2396a7615e03331299e3652dde')
 validpgpkeys=(3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F)
-md5sums=('664ec3a2df7805ed3464639aaae332d6'
-         'SKIP'
-         'f121a3bee2e223786caa5776863d0dcf')
 
 prepare() {
   mkdir -p binutils-build
@@ -30,10 +30,13 @@ prepare() {
   #cd binutils-gdb
   cd binutils-$pkgver
 
+  # Turn off development mode (-Werror, gas run-time checks, date in sonames)
+  sed -i '/^development=/s/true/false/' bfd/development.sh
+
   # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS"
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
 
-  patch -Np1 -i ../binutils-a72427b1ae01304da0b5170e1e53f68c6d46c1de.patch
+  patch -Np1 -i ../binutils-cb5f6a3e146cc70bc2d864989386df80acec5d3e.patch
 }
 
 build() {
diff --git a/binutils-a72427b1ae01304da0b5170e1e53f68c6d46c1de.patch.xz b/binutils-a72427b1ae01304da0b5170e1e53f68c6d46c1de.patch.xz
deleted file mode 100644
index 672388b6951f..000000000000
--- a/binutils-a72427b1ae01304da0b5170e1e53f68c6d46c1de.patch.xz
+++ /dev/null
diff --git a/binutils-cb5f6a3e146cc70bc2d864989386df80acec5d3e.patch.xz b/binutils-cb5f6a3e146cc70bc2d864989386df80acec5d3e.patch.xz
new file mode 100644
index 000000000000..de43b49ec74a
--- /dev/null
+++ b/binutils-cb5f6a3e146cc70bc2d864989386df80acec5d3e.patch.xz