Bug#776100: fails to build cross compiler: cross-install-location.diff needs an update

[Helmut Grohne <helmut@subdivi.de>]

Source: gcc-5
Version: 5-20150121-1
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap

Building a cross compiler from gcc-5 fails for any architecture, because
cross-install-location.diff fails to apply. Please consider updating it
with the attached patch.

Helmut

diff -u gcc-5-5-20150121/debian/changelog gcc-5-5-20150121/debian/changelog
--- gcc-5-5-20150121/debian/changelog
+++ gcc-5-5-20150121/debian/changelog
@@ -1,3 +1,10 @@
+gcc-5 (5-20150121-1.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Fix debian/patches/cross-install-location.diff for gcc-5. Closes: #-1.
+
+ -- Helmut Grohne <helmut@subdivi.de>  Fri, 23 Jan 2015 23:22:37 +0100
+
 gcc-5 (5-20150121-1) experimental; urgency=medium
 
   * GCC 5.
diff -u gcc-5-5-20150121/debian/patches/cross-install-location.diff gcc-5-5-20150121/debian/patches/cross-install-location.diff
--- gcc-5-5-20150121/debian/patches/cross-install-location.diff
+++ gcc-5-5-20150121/debian/patches/cross-install-location.diff
@@ -61,8 +61,8 @@
  ACLOCAL_AMFLAGS = -I .. -I ../config
  AUTOMAKE_OPTIONS = no-dependencies
  gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
--libexecsubdir := $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
-+libexecsubdir := $(libexecdir)/gcc-cross/$(target_noncanonical)/$(gcc_version)
+-libexecsubdir := $(libexecdir)/gcc/$(real_target_noncanonical)/$(gcc_version)$(accel_dir_suffix)
++libexecsubdir := $(libexecdir)/gcc-cross/$(real_target_noncanonical)/$(gcc_version)$(accel_dir_suffix)
  AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS)
  AM_CFLAGS = @ac_lto_plugin_warn_cflags@
  AM_LDFLAGS = @ac_lto_plugin_ldflags@
@@ -74,8 +74,8 @@
  
  gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
  target_noncanonical := @target_noncanonical@
--libexecsubdir := $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
-+libexecsubdir := $(libexecdir)/gcc-cross/$(target_noncanonical)/$(gcc_version)
+-libexecsubdir := $(libexecdir)/gcc/$(real_target_noncanonical)/$(gcc_version)$(accel_dir_suffix)
++libexecsubdir := $(libexecdir)/gcc-cross/$(real_target_noncanonical)/$(gcc_version)$(accel_dir_suffix)
  
  AM_CPPFLAGS = -I$(top_srcdir)/../include $(DEFS)
  AM_CFLAGS = @ac_lto_plugin_warn_cflags@
@@ -150,11 +150,11 @@
  # --------
  
  # Directory in which the compiler finds libraries etc.
--libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(version)
-+libsubdir = $(libdir)/gcc-cross/$(target_noncanonical)/$(version)
+-libsubdir = $(libdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
++libsubdir = $(libdir)/gcc-cross/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
  # Directory in which the compiler finds executables
--libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(version)
-+libexecsubdir = $(libexecdir)/gcc-cross/$(target_noncanonical)/$(version)
+-libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
++libexecsubdir = $(libexecdir)/gcc-cross/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
  # Directory in which all plugin resources are installed
  plugin_resourcesdir = $(libsubdir)/plugin
   # Directory in which plugin headers are installed
@@ -261,9 +261,9 @@
 --- a/src/libgomp/Makefile.in
 +++ b/src/libgomp/Makefile.in
 @@ -291,8 +291,8 @@
- SUBDIRS = testsuite
- gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
- search_path = $(addprefix $(top_srcdir)/config/, $(config_path)) $(top_srcdir)
+ search_path = $(addprefix $(top_srcdir)/config/, $(config_path)) $(top_srcdir) \
+ 	      $(top_srcdir)/../include
+ 
 -fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/finclude
 -libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
 +fincludedir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)/finclude
@@ -294,8 +294,8 @@
  STRIP_FOR_TARGET = $(STRIP)
  
  # Directory in which the compiler finds libraries etc.
--libsubdir = $(libdir)/gcc/$(host_noncanonical)/$(version)
-+libsubdir = $(libdir)/gcc-cross/$(host_noncanonical)/$(version)
+-libsubdir = $(libdir)/gcc/$(host_noncanonical)/$(version)@accel_dir_suffix@
++libsubdir = $(libdir)/gcc-cross/$(host_noncanonical)/$(version)@accel_dir_suffix@
  # Used to install the shared libgcc.
  slibdir = @slibdir@
  # Maybe used for DLLs on Windows targets.