Bug#776509: building gcc-5 cross toolchains fails at applying cross-ma-install-location.diff

[Helmut Grohne <helmut@subdivi.de>]

Package: cross-gcc-dev
Version: 13
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap

Steps to reproduce:
$ apt-get source gcc-5
...
$ cd gcc-5-*
$ QUILT_PATCHES=/usr/share/cross-gcc/patches/gcc-5 quilt push -a
...
$ echo arm64 > debian/target
$ ./debian/rules patch
...

The last step fails at applying cross-ma-install-location.diff. The
attached patch updates src:cross-gcc to update the patch that adds
cross-ma-install-location.diff to the gcc source (i.e. it is a diff of a
diff of a diff %-). All that changed (in the innermost diff) is hunk
context.

Helmut

diff -Nru cross-gcc-13/debian/changelog cross-gcc-13+nmu1/debian/changelog
--- cross-gcc-13/debian/changelog
+++ cross-gcc-13+nmu1/debian/changelog
@@ -1,3 +1,10 @@
+cross-gcc (13+nmu1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix cross-ma-install-location.diff for gcc-5. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Wed, 28 Jan 2015 21:26:38 +0000
+
 cross-gcc (13) unstable; urgency=medium
 
   * Supporting multiple gcc trees at the same time. Currently 4.9 and 5
diff -Nru cross-gcc-13/patches/gcc-5/0004-reverted-removal-of-with_deps_on_target_arch_pkgs-in.patch cross-gcc-13+nmu1/patches/gcc-5/0004-reverted-removal-of-with_deps_on_target_arch_pkgs-in.patch
--- cross-gcc-13/patches/gcc-5/0004-reverted-removal-of-with_deps_on_target_arch_pkgs-in.patch
+++ cross-gcc-13+nmu1/patches/gcc-5/0004-reverted-removal-of-with_deps_on_target_arch_pkgs-in.patch
@@ -171,7 +171,7 @@
 +-fi
 ++nover_glibgo_toolexecdir='${libdir}/gcc/${host_alias}'
 ++nover_glibgo_toolexeclibdir='${libdir}'
-+ multi_os_directory=`$CC -print-multi-os-directory`
++ multi_os_directory=`$GOC -print-multi-os-directory`
 + case $multi_os_directory in
 +   .) ;; # Avoid trailing /.
 +Index: b/src/libgomp/configure.ac