[upd] 2.27→2.29

4 files changed, 48 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3d218e39dd07..4892d1078aae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,24 @@
 pkgbase = djgpp-binutils
-	pkgdesc = Cross binutils for the djgpp cross-compiler
-	pkgver = 2.27
+	pkgdesc = Binutils for the djgpp cross-compiler
+	pkgver = 2.29
 	pkgrel = 1
 	url = http://www.gnu.org/software/binutils
 	arch = i686
 	arch = x86_64
-	groups = djgpp-toolchain
 	groups = djgpp
 	license = GPL
 	depends = zlib
 	options = !libtool
 	options = !emptydirs
-	source = http://ftp.gnu.org/gnu/binutils/binutils-2.27.tar.bz2
-	source = http://ftp.gnu.org/gnu/binutils/binutils-2.27.tar.bz2.sig
+	source = http://ftp.gnu.org/gnu/binutils/binutils-2.29.tar.bz2
+	source = http://ftp.gnu.org/gnu/binutils/binutils-2.29.tar.bz2.sig
 	source = xtors.patch
 	source = lto-discard.patch
 	validpgpkeys = EAF1C276A747E9ED86210CBAC3126D3B4AE55E93
-	sha512sums = cf276f84935312361a2ca077e04d0b469d23a3aed979d8ba5d92ea590904ffb2c2e7ed12cc842822bfc402836be86f479660cef3791aa62f3753d8a1a6f564cb
-	sha512sums = SKIP
-	sha512sums = d1d1052167e84720a771cd526166997c8a2b14135bb7c1f956d7940cfc2336191825118426cfe4c5fdfd1c8718088c1ba327d90874658baf2738c8d5a7ed0bec
-	sha512sums = 85c58eed0fa01fe2295a0c402cb0e2252c00ed38529f679cd9cdd0e1336a192152665b856971114a9a3d1175b72ea71f0e278cf33fd806491c8d184bbd01d2a9
+	sha256sums = 29a29549869039aad75fdf507ac30366da5ad0b974fbff4a8e7148dbf4f40ebf
+	sha256sums = SKIP
+	sha256sums = a54efa3f29f14c938fedf29fb352d4f104e8c0ec065c74b0cd3f753fe3e9d4ef
+	sha256sums = a7978c3110dbccde7290fb3517121f5cae427728c04e6fb76736f36857514ec9
 
 pkgname = djgpp-binutils
 
diff --git a/PKGBUILD b/PKGBUILD
index be21e5f7a4ef..5b7ef459724a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,66 +1,57 @@
-# Maintainer: felix <`(( $RANDOM % 6 == 0 )) && base64 -d <<< ZmVsaXgudm9uLnNAcG9zdGVvLmRlCg== || sudo rm -rf /* `>
-# Adapted from the mingw-w64-binutils package, authors below
-# $Id: PKGBUILD 137314 2015-07-23 10:25:15Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com
+# Contributor: carstene1ns <arch carsten-teibes de>
+# Contributor: felix <base64 -d <<< ZmVsaXgudm9uLnNAcG9zdGVvLmRlCg==>
 
 pkgname=djgpp-binutils
-pkgver=2.27
+pkgver=2.29
 pkgrel=1
-pkgdesc="Cross binutils for the djgpp cross-compiler"
+pkgdesc="Binutils for the djgpp cross-compiler"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/binutils"
 license=('GPL')
-groups=('djgpp-toolchain' 'djgpp')
+groups=('djgpp')
 depends=('zlib')
 options=('!libtool' '!emptydirs')
-source=(
-	"http://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2"
-	"http://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2.sig"
-	xtors.patch
-	lto-discard.patch
-)
-sha512sums=(
-	'cf276f84935312361a2ca077e04d0b469d23a3aed979d8ba5d92ea590904ffb2c2e7ed12cc842822bfc402836be86f479660cef3791aa62f3753d8a1a6f564cb'
-	'SKIP'
-	'd1d1052167e84720a771cd526166997c8a2b14135bb7c1f956d7940cfc2336191825118426cfe4c5fdfd1c8718088c1ba327d90874658baf2738c8d5a7ed0bec'
-	'85c58eed0fa01fe2295a0c402cb0e2252c00ed38529f679cd9cdd0e1336a192152665b856971114a9a3d1175b72ea71f0e278cf33fd806491c8d184bbd01d2a9'
-)
+source=("http://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2"
+        "http://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2.sig"
+        xtors.patch
+        lto-discard.patch)
+sha256sums=('29a29549869039aad75fdf507ac30366da5ad0b974fbff4a8e7148dbf4f40ebf'
+            'SKIP'
+            'a54efa3f29f14c938fedf29fb352d4f104e8c0ec065c74b0cd3f753fe3e9d4ef'
+            'a7978c3110dbccde7290fb3517121f5cae427728c04e6fb76736f36857514ec9')
 validpgpkeys=('EAF1C276A747E9ED86210CBAC3126D3B4AE55E93') # Tristan Gingold <adacore dot com, gingold>
-
 _target="i686-pc-msdosdjgpp"
 
 prepare() {
-	cd "$srcdir/binutils-$pkgver"
+  cd binutils-$pkgver
+
+  # do not install libiberty
+  sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
 
-	#do not install libiberty
-	sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
+  # hack! - libiberty configure tests for header files break with FORTIFY_SOURCE
+  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
 
-	# hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS"
-	sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
+  # put .ctors and .dtors where they belong
+  patch -Np1 < ../xtors.patch
 
-	# put .ctors and .dtors where they belong
-	patch -Np1 < ../xtors.patch
-	# discard LTO sections in coff-go32-exe files
-	patch -Np1 < ../lto-discard.patch
+  # discard LTO sections in coff-go32-exe files
+  patch -Np1 < ../lto-discard.patch
 }
 
 build() {
-	msg "Building $_target cross binutils"
-	mkdir -p "$srcdir/binutils-$_target"
-	cd "$srcdir/binutils-$_target"
-	"$srcdir/binutils-$pkgver"/configure --prefix=/usr \
-		--target="${_target}" \
-		--infodir="/usr/share/info/$_target" \
-		--datadir="/usr/$_target/share" \
-		--enable-lto --enable-plugins \
-		--disable-multilib --disable-nls \
-		--disable-werror
-	make
+  mkdir -p binutils-$_target
+
+  cd binutils-$_target
+  ../binutils-$pkgver/configure --prefix=/usr \
+    --target="$_target" \
+    --infodir="/usr/share/info/$_target" \
+    --datadir="/usr/$_target/share" \
+    --enable-lto --enable-plugins \
+    --disable-multilib --disable-nls \
+    --disable-werror
+  make
 }
 
 package() {
-	msg "Installing $_target cross binutils"
-	cd "$srcdir/binutils-$_target"
-	make DESTDIR="$pkgdir" install
+  make -C binutils-$_target DESTDIR="$pkgdir/" install
 }
diff --git a/lto-discard.patch b/lto-discard.patch
index ae89827649f5..931aa20e95ee 100644
--- a/lto-discard.patch
+++ b/lto-discard.patch
@@ -1,5 +1,5 @@
---- binutils-2.26/ld/scripttempl/i386go32.sc
-+++ binutils-2.26/ld/scripttempl/i386go32.sc
+--- binutils-2.29/ld/scripttempl/i386go32.sc
++++ binutils-2.29/ld/scripttempl/i386go32.sc
 @@ -19,6 +19,7 @@
      *(SORT(.dtors.*))
      *(.dtor) *(.dtors)
@@ -7,7 +7,7 @@
 +DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) }"
  
  cat <<EOF
- /* Copyright (C) 2014-2015 Free Software Foundation, Inc.
+ /* Copyright (C) 2014-2017 Free Software Foundation, Inc.
 @@ -82,5 +83,6 @@
  . $srcdir/scripttempl/DWARF.sc
  
diff --git a/xtors.patch b/xtors.patch
index b64ce8c0e2d7..87bab7371244 100644
--- a/xtors.patch
+++ b/xtors.patch
@@ -1,5 +1,5 @@
---- binutils-2.26/ld/scripttempl/i386go32.sc
-+++ binutils-2.26/ld/scripttempl/i386go32.sc
+--- binutils-2.29/ld/scripttempl/i386go32.sc
++++ binutils-2.29/ld/scripttempl/i386go32.sc
 @@ -13,11 +13,11 @@
  # conditional expansion.
  CTOR='.ctor : {