3 files changed, 100 insertions, 6 deletions
diff --git a/main/binutils/02_fix-opcodes-configure-bfd-version-on-busybox-ash.patch b/main/binutils/02_fix-opcodes-configure-bfd-version-on-busybox-ash.patch
new file mode 100644
index 000000000..a2672cc57
--- /dev/null
+++ b/main/binutils/02_fix-opcodes-configure-bfd-version-on-busybox-ash.patch
@@ -0,0 +1,41 @@
+Author: "P. J. McDermott" <pjm@nac.net>
+Subject: Fix opcodes/configure (BFD_VERSION) on BusyBox ash
+
+Commit c4dd807 in binutils-gdb.git somehow broke opcodes/configure on ash:
+
+    mkdir ./opcodes
+    Configuring in ./opcodes
+    configure: creating cache ./config.cache
+    [...]
+    /usr/src/gdb_7.6.1+sip1-1/tmp/src/opcodes/configure: .: line 12678: can't open '/usr/src/gdb_7.6.1+sip1-1/tmp/src/opcodes/configure.host'
+
+I'm not sure why this happens, but I suspect _AS_LINENO_PREPARE is involved
+here.
+
+For now, we'll avoid this issue by reverting to pre-c4dd807 behavior, updated to
+use AC_INIT.
+
+diff -Naur src.orig/opcodes/configure src/opcodes/configure
+--- src.orig/opcodes/configure	2013-02-06 18:22:25.000000000 -0500
++++ src/opcodes/configure	2014-01-17 08:25:48.281453599 -0500
+@@ -3216,7 +3216,7 @@
+ # We currently only use the version number for the name of any shared
+ # library.  For user convenience, we always use the same version
+ # number that BFD is using.
+-BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'`
++BFD_VERSION=`sed -n 's/AC_INIT(\[bfd\], *\[\([0-9.]*\)\])/\1/p' <${srcdir}/../bfd/configure.in`
+ 
+ am__api_version='1.11'
+ 
+diff -Naur src.orig/opcodes/configure.in src/opcodes/configure.in
+--- src.orig/opcodes/configure.in	2013-02-06 18:22:26.000000000 -0500
++++ src/opcodes/configure.in	2014-01-17 08:25:42.873294676 -0500
+@@ -28,7 +28,7 @@
+ # library.  For user convenience, we always use the same version
+ # number that BFD is using.
+ changequote(,)dnl
+-BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'`
++BFD_VERSION=`sed -n 's/AC_INIT(\[bfd\], *\[\([0-9.]*\)\])/\1/p' <${srcdir}/../bfd/configure.in`
+ changequote([,])dnl
+ 
+ AM_INIT_AUTOMAKE(opcodes, ${BFD_VERSION})
diff --git a/main/binutils/APKBUILD b/main/binutils/APKBUILD
index 072da2ebb..a85e84b06 100644
--- a/main/binutils/APKBUILD
+++ b/main/binutils/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=binutils
 pkgver=2.24
-pkgrel=1
+pkgrel=2
 pkgdesc="Tools necessary to build programs"
 url="http://www.gnu.org/software/binutils/"
 depends=""
-makedepends="bison flex texinfo zlib-dev bash"
+makedepends="bison flex texinfo zlib-dev"
 arch="all"
 license="GPL2 GPL3+ LGPL2 BSD"
 subpackages="$pkgname-doc $pkgname-libs"
@@ -17,7 +17,10 @@ if [ "$CHOST" != "$CTARGET" ] && [ -n "$CHOST" -a -n "$CTARGET" ]; then
 fi
 
 source="http://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2
-	binutils-ld-fix-static-linking.patch"
+	binutils-ld-fix-static-linking.patch
+	02_fix-opcodes-configure-bfd-version-on-busybox-ash.patch
+	bfd-version.patch
+	"
 
 _builddir="$srcdir/$pkgname-$pkgver"
 prepare() {
@@ -80,8 +83,14 @@ libs() {
 }
 
 md5sums="e0f71a7b2ddab0f8612336ac81d9636b  binutils-2.24.tar.bz2
-c9f308494b87c243f121a56d58f2da87  binutils-ld-fix-static-linking.patch"
+c9f308494b87c243f121a56d58f2da87  binutils-ld-fix-static-linking.patch
+26210092adc0e0d7b236eb464dea543a  02_fix-opcodes-configure-bfd-version-on-busybox-ash.patch
+56c179892fa33cd0bac127761834e5d9  bfd-version.patch"
 sha256sums="e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137  binutils-2.24.tar.bz2
-d5c5581d0ba04ef2e3690f6fb57435bf7ce343f2376fe972a2a693c5429eec9c  binutils-ld-fix-static-linking.patch"
+d5c5581d0ba04ef2e3690f6fb57435bf7ce343f2376fe972a2a693c5429eec9c  binutils-ld-fix-static-linking.patch
+0bbd84e3e761e482e5a78ca126964b2af3b492dad66f49b62603f653bb795ea5  02_fix-opcodes-configure-bfd-version-on-busybox-ash.patch
+79cea3abac2fc544494853b03a5fbf92489969397286d201b25706359e0862bb  bfd-version.patch"
 sha512sums="5ec95ad47d49b12c4558a8db0ca2109d3ee1955e3776057f3330c4506f8f4d1cf5e505fbf8a16b98403a0fcdeaaf986fe0a22be6456247dbdace63ce1f776b12  binutils-2.24.tar.bz2
-ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch"
+ecee33b0e435aa704af1c334e560f201638ff79e199aa11ed78a72f7c9b46f85fbb227af5748e735fd681d1965fcc42ac81b0c8824e540430ce0c706c81e8b49  binutils-ld-fix-static-linking.patch
+f7c2d19c4fce831d5f2791e4daadde70a1286bcf27074e24e635224fc9f39f47b6d95cbf2860eea1be1362f995e348fca0a0c2d9fe2d491dfe5d674c82f83bfb  02_fix-opcodes-configure-bfd-version-on-busybox-ash.patch
+2fce2bbb667e643d090898d221f896ef7c192e858edbda3d460cb2067b130ce6d44730a47e332cae4c7bacf1a858dcc33715246fd209c7d98d2eda4aeb3f5b6c  bfd-version.patch"
diff --git a/main/binutils/bfd-version.patch b/main/binutils/bfd-version.patch
new file mode 100644
index 000000000..32ab24c27
--- /dev/null
+++ b/main/binutils/bfd-version.patch
@@ -0,0 +1,44 @@
+--- ./gas/configure.orig
++++ ./gas/configure
+@@ -3221,7 +3221,7 @@
+ fi
+ 
+ 
+-BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'`
++BFD_VERSION=`sed -n 's/AC_INIT(\[bfd\], *\[\([0-9.]*\)\])/\1/p' <${srcdir}/../bfd/configure.in`
+ am__api_version='1.11'
+ 
+ # Find a good install program.  We prefer a C program (faster),
+--- ./gprof/configure.orig
++++ ./gprof/configure
+@@ -3147,7 +3147,7 @@
+ fi
+ 
+ 
+-BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'`
++BFD_VERSION=`sed -n 's/AC_INIT(\[bfd\], *\[\([0-9.]*\)\])/\1/p' <${srcdir}/../bfd/configure.in`
+ am__api_version='1.11'
+ 
+ # Find a good install program.  We prefer a C program (faster),
+--- ./binutils/configure.orig
++++ ./binutils/configure
+@@ -3238,7 +3238,7 @@
+ fi
+ 
+ 
+-BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'`
++BFD_VERSION=`sed -n 's/AC_INIT(\[bfd\], *\[\([0-9.]*\)\])/\1/p' <${srcdir}/../bfd/configure.in`
+ am__api_version='1.11'
+ 
+ # Find a good install program.  We prefer a C program (faster),
+--- ./ld/configure.orig
++++ ./ld/configure
+@@ -3556,7 +3556,7 @@
+ fi
+ 
+ 
+-BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'`
++BFD_VERSION=`sed -n 's/AC_INIT(\[bfd\], *\[\([0-9.]*\)\])/\1/p' <${srcdir}/../bfd/configure.in`
+ am__api_version='1.11'
+ 
+ # Find a good install program.  We prefer a C program (faster),