Bug#760770: gcc-4.9: fails to build cross-compiler package

[Helmut Grohne <helmut@subdivi.de>]

Control: retitle -1 fails to cross build libphobos when setting with_deps_on_target_arch_pkgs=yes
Control: tags -1 = patch

Ian Jackson suggested that I should take care of this. See:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=766708#68

On Tue, Sep 09, 2014 at 07:24:19PM +0200, Rico Rommel wrote:
> libphobos-cross-ma-libdir.diff corrects the installdir in libphobos and 
> fix-rules includes the patch into rules.patch

This should not be a separate patch but rather integrated into
cross-ma-install-location.diff. Once it sits in that patch, it is
guaranteed to not affect the native build or the supported default
cross toolchain build, because neither use that patch.

I am attaching the updated patch.

Helmut

diff -u gcc-4.9-4.9.1/debian/changelog gcc-4.9-4.9.1/debian/changelog
--- gcc-4.9-4.9.1/debian/changelog
+++ gcc-4.9-4.9.1/debian/changelog
@@ -1,3 +1,10 @@
+gcc-4.9 (4.9.1-19.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Update cross-ma-install-location.diff for libphobos. Closes: #760770.
+
+ -- Helmut Grohne <helmut@subdivi.de>  Tue, 28 Oct 2014 18:57:40 +0100
+
 gcc-4.9 (4.9.1-19) unstable; urgency=medium
 
   * GCC 4.9.2 release candidate.
diff -u gcc-4.9-4.9.1/debian/patches/cross-ma-install-location.diff gcc-4.9-4.9.1/debian/patches/cross-ma-install-location.diff
--- gcc-4.9-4.9.1/debian/patches/cross-ma-install-location.diff
+++ gcc-4.9-4.9.1/debian/patches/cross-ma-install-location.diff
@@ -402,0 +403,21 @@
+Index: b/src/libphobos/configure.ac
+===================================================================
+--- a/src/libphobos/configure.ac
++++ b/src/libphobos/configure.ac
+@@ -247,14 +247,8 @@
+ AC_ARG_WITH([cross-host],
+   AC_HELP_STRING([--with-cross-host=HOST],
+ 	       [configuring with a cross compiler]))
+-if test -n "$with_cross_host" &&
+-   test x"$with_cross_host" != x"no"; then
+-  phobos_toolexecdir='${exec_prefix}/${host_alias}'
+-  phobos_toolexeclibdir='${toolexecdir}/lib'
+-else
+-  phobos_toolexecdir='${libdir}/gcc/${host_alias}'
+-  phobos_toolexeclibdir='${libdir}'
+-fi
++phobos_toolexecdir='${libdir}/gcc/${host_alias}'
++phobos_toolexeclibdir='${libdir}'
+ # The norm would be to use $GDC -print-multi-os-directory, but
+ # that would require modifying config-ml.in
+ multi_os_directory=`$CC -print-multi-os-directory`