From 7b3729d9a2577fe6fab818c33375db2ab50e14be Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Wed, 03 Jul 2019 14:48:53 -0400 Subject: patches: Remove opcodes/configure patch Upstream commit 2e98a7bd882356a23076ad4a51a251d9ab1ce070 fixed this. See also , which refers to this patch. --- (limited to 'patches') diff --git a/patches/02_fix-opcodes-configure-bfd-version-on-busybox-ash.patch b/patches/02_fix-opcodes-configure-bfd-version-on-busybox-ash.patch deleted file mode 100644 index a2672cc..0000000 --- a/patches/02_fix-opcodes-configure-bfd-version-on-busybox-ash.patch +++ /dev/null @@ -1,41 +0,0 @@ -Author: "P. J. McDermott" -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}) -- cgit v0.9.1