patches/binutils-2.24-posix_sh.diff

   1 Author: "P. J. McDermott" <pjm@nac.net>
   2 Subject: Fix opcodes/configure (BFD_VERSION) on BusyBox ash
   3
   4 Commit c4dd807 in binutils-gdb.git somehow broke opcodes/configure on ash:
   5
   6     mkdir ./opcodes
   7     Configuring in ./opcodes
   8     configure: creating cache ./config.cache
   9     [...]
  10     /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'
  11
  12 I'm not sure why this happens, but I suspect _AS_LINENO_PREPARE is involved
  13 here.
  14
  15 For now, we'll avoid this issue by reverting to pre-c4dd807 behavior, updated to
  16 use AC_INIT.
  17
  18 diff -Naur src.orig/opcodes/configure src/opcodes/configure
  19 --- src.orig/opcodes/configure  2013-02-06 18:22:25.000000000 -0500
  20 +++ src/opcodes/configure       2014-01-17 08:25:48.281453599 -0500
  21 @@ -3216,7 +3216,7 @@
  22  # We currently only use the version number for the name of any shared
  23  # library.  For user convenience, we always use the same version
  24  # number that BFD is using.
  25 -BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'`
  26 +BFD_VERSION=`sed -n 's/AC_INIT(\[bfd\], *\[\([0-9.]*\)\])/\1/p' <${srcdir}/../bfd/configure.in`
  27
  28  am__api_version='1.11'
  29
  30 diff -Naur src.orig/opcodes/configure.in src/opcodes/configure.in
  31 --- src.orig/opcodes/configure.in       2013-02-06 18:22:26.000000000 -0500
  32 +++ src/opcodes/configure.in    2014-01-17 08:25:42.873294676 -0500
  33 @@ -28,7 +28,7 @@
  34  # library.  For user convenience, we always use the same version
  35  # number that BFD is using.
  36  changequote(,)dnl
  37 -BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'`
  38 +BFD_VERSION=`sed -n 's/AC_INIT(\[bfd\], *\[\([0-9.]*\)\])/\1/p' <${srcdir}/../bfd/configure.in`
  39  changequote([,])dnl
  40
  41  AM_INIT_AUTOMAKE(opcodes, ${BFD_VERSION})
  42 --- binutils-2.24.org//gas/configure
  43 +++ binutils-2.24/gas/configure
  44 @@ -3221,7 +3221,7 @@
  45  fi
  46
  47
  48 -BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'`
  49 +BFD_VERSION=`sed -n 's/AC_INIT(\[bfd\], *\[\([0-9.]*\)\])/\1/p' <${srcdir}/../bfd/configure.in`
  50  am__api_version='1.11'
  51
  52  # Find a good install program.  We prefer a C program (faster),
  53 --- binutils-2.24.org/gprof/configure
  54 +++ binutils-2.24/gprof/configure
  55 @@ -3147,7 +3147,7 @@
  56  fi
  57
  58
  59 -BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'`
  60 +BFD_VERSION=`sed -n 's/AC_INIT(\[bfd\], *\[\([0-9.]*\)\])/\1/p' <${srcdir}/../bfd/configure.in`
  61  am__api_version='1.11'
  62
  63  # Find a good install program.  We prefer a C program (faster),
  64 --- binutils-2.24.org/binutils/configure
  65 +++ binutils-2.24/binutils/configure
  66 @@ -3238,7 +3238,7 @@
  67  fi
  68
  69
  70 -BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'`
  71 +BFD_VERSION=`sed -n 's/AC_INIT(\[bfd\], *\[\([0-9.]*\)\])/\1/p' <${srcdir}/../bfd/configure.in`
  72  am__api_version='1.11'
  73
  74  # Find a good install program.  We prefer a C program (faster),
  75 --- binutils-2.24.org/ld/configure
  76 +++ binutils-2.24/ld/configure
  77 @@ -3556,7 +3556,7 @@
  78  fi
  79
  80
  81 -BFD_VERSION=`${srcdir}/../bfd/configure --version | sed -n -e '1s,.* ,,p'`
  82 +BFD_VERSION=`sed -n 's/AC_INIT(\[bfd\], *\[\([0-9.]*\)\])/\1/p' <${srcdir}/../bfd/configure.in`
  83  am__api_version='1.11'
  84
  85  # Find a good install program.  We prefer a C program (faster),