From 961565b3271840816af4fb7e167851ea79cace3a Mon Sep 17 00:00:00 2001
From: Jannik Birk <birk.jannik@gmail.com>
Date: Sun, 3 Sep 2017 16:26:52 +0200
Subject: Update for version 2.29

---
 .SRCINFO                      |  8 +++++---
 PKGBUILD                      | 33 ++++++++++++++++++++-------------
 libiberty-ignore-cflags.patch | 16 ++++++++++++++++
 3 files changed, 41 insertions(+), 16 deletions(-)
 create mode 100644 libiberty-ignore-cflags.patch

diff --git a/.SRCINFO b/.SRCINFO
index ab561b0..31d268d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
 pkgbase = i686-elf-binutils
 	pkgdesc = A set of programs to assemble and manipulate binary and object files for the i686-elf target
-	pkgver = 2.27
+	pkgver = 2.29
 	pkgrel = 1
 	url = http://www.gnu.org/software/binutils/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	depends = zlib
-	source = ftp://ftp.gnu.org/gnu/binutils/binutils-2.27.tar.bz2
-	sha256sums =369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88
+	source = http://mirrors.kernel.org/gnu/binutils/binutils-2.29.tar.xz
+	source = libiberty-ignore-cflags.patch
+	sha256sums = 0b871e271c4c620444f8264f72143b4d224aa305306d85dd77ab8dce785b1e85
+	sha256sums = 8b2aea00e98f7c311b1d0fb14e4b435a03c65fde32bc992c924edb6fa7b83c9c
 
 pkgname = i686-elf-binutils
 
diff --git a/PKGBUILD b/PKGBUILD
index 4252d61..33c5d27 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,42 +2,49 @@
 
 _target=i686-elf
 pkgname=$_target-binutils
-pkgver=2.27
+pkgver=2.29
 pkgrel=1
 pkgdesc='A set of programs to assemble and manipulate binary and object files for the i686-elf target'
 arch=(i686 x86_64)
 url='http://www.gnu.org/software/binutils/'
 license=(GPL)
 depends=(zlib)
-source=(ftp://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2)
-sha256sums=('369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88')
+source=("http://mirrors.kernel.org/gnu/binutils/binutils-$pkgver.tar.xz"
+        "libiberty-ignore-cflags.patch")
+sha256sums=('0b871e271c4c620444f8264f72143b4d224aa305306d85dd77ab8dce785b1e85'
+            '8b2aea00e98f7c311b1d0fb14e4b435a03c65fde32bc992c924edb6fa7b83c9c')
+_basedir=binutils-$pkgver
 
 prepare() {
-  cd binutils-$pkgver
-  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
+  cd $_basedir
+
+  patch -p1 -i $srcdir/libiberty-ignore-cflags.patch
+
+  mkdir $srcdir/binutils-build
 }
 
 build() {
-  cd binutils-$pkgver
+  cd binutils-build
 
-  ./configure --target=$_target \
-              --with-sysroot=/usr/$_target \
-              --prefix=/usr \
-              --disable-nls \
-              --disable-werror
+  $srcdir/$_basedir/configure \
+    --target=$_target \
+    --with-sysroot=/usr/$_target \
+    --prefix=/usr \
+    --disable-nls \
+    --disable-werror
 
   make
 }
 
 check() {
-  cd binutils-$pkgver
+  cd binutils-build
   
   # do not abort on errors - manually check log files
   make -k check
 }
 
 package() {
-  cd binutils-$pkgver
+  cd binutils-build
 
   make DESTDIR="$pkgdir" install
 
diff --git a/libiberty-ignore-cflags.patch b/libiberty-ignore-cflags.patch
new file mode 100644
index 0000000..ddef5a4
--- /dev/null
+++ b/libiberty-ignore-cflags.patch
@@ -0,0 +1,16 @@
+diff -p1 -r a/libiberty/configure b/libiberty/configure
+*** a/libiberty/configure	Tue Jul  4 20:43:21 2017
+--- b/libiberty/configure	Fri Aug 25 01:41:25 2017
+***************
+*** 10,11 ****
+--- 10,19 ----
+  # gives unlimited permission to copy, distribute and modify it.
++ 
++ ## ---------------------------------------------------------- ##
++ ## PATCHED: Unset CFLAGS/CPPFLAGS so that libiberty compiles. ##
++ ## ---------------------------------------------------------- ##
++ 
++ CFLAGS=
++ CPPFLAGS=
++ 
+  ## -------------------- ##
-- 
cgit v1.2.1