[gcc-7] 137/354: * Update the cross-install-location patch (Helmut Grohne). Closes: #855565.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository gcc-7.

commit d4e58a982390ecda99b19c3fb512ea60b6f2c67e
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed Mar 8 15:19:35 2017 +0000

      * Update the cross-install-location patch (Helmut Grohne). Closes: #855565.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9345 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                           |  1 +
 debian/patches/cross-install-location.diff | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 829f865..02c796f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ gcc-7 (7-20170303-1) UNRELEASED; urgency=medium
   * Fix libcc1.so symlink for cross compilers. Addresses: #856875.
   * Fix base package name for rtlibs stage build (Helmut Grohne).
     Closes: #857074.
+  * Update the cross-install-location patch (Helmut Grohne). Closes: #855565.
 
  -- Matthias Klose <doko at debian.org>  Fri, 03 Mar 2017 10:14:38 +0100
 
diff --git a/debian/patches/cross-install-location.diff b/debian/patches/cross-install-location.diff
index 35963a1..5e30cba 100644
--- a/debian/patches/cross-install-location.diff
+++ b/debian/patches/cross-install-location.diff
@@ -61,7 +61,7 @@ Index: b/src/lto-plugin/Makefile.in
 @@ -255,7 +255,7 @@ with_libiberty = @with_libiberty@
  ACLOCAL_AMFLAGS = -I .. -I ../config
  AUTOMAKE_OPTIONS = no-dependencies
- gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+ gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
 -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)
@@ -167,9 +167,9 @@ Index: b/src/gcc/Makefile.in
 -  -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \
 +  -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-cross/\" \
 +  -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc-cross/\" \
-   -DDEFAULT_TARGET_VERSION=\"$(BASEVER_c)\" \
-   -DDEFAULT_TARGET_FULL_VERSION=\"$(FULLVER_c)\" \
+   -DDEFAULT_TARGET_VERSION=\"$(version)\" \
    -DDEFAULT_REAL_TARGET_MACHINE=\"$(real_target_noncanonical)\" \
+   -DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\" \
 @@ -2671,7 +2671,7 @@ PREPROCESSOR_DEFINES = \
    -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
    -DNATIVE_SYSTEM_HEADER_DIR=\"$(NATIVE_SYSTEM_HEADER_DIR)\" \
@@ -251,7 +251,7 @@ Index: b/src/libada/Makefile.in
 @@ -68,7 +68,7 @@ GCC_DIR=$(MULTIBUILDTOP)../../$(host_sub
  
  target_noncanonical:=@target_noncanonical@
- version := $(shell cat $(srcdir)/../gcc/BASE-VER)
+ version := $(shell @get_gcc_base_ver@ $(srcdir)/../gcc/BASE-VER)
 -libsubdir := $(libdir)/gcc/$(target_noncanonical)/$(version)$(MULTISUBDIR)
 +libsubdir := $(libdir)/gcc-cross/$(target_noncanonical)/$(version)$(MULTISUBDIR)
  ADA_RTS_DIR=$(GCC_DIR)/ada/rts$(subst /,_,$(MULTISUBDIR))
@@ -265,9 +265,9 @@ Index: b/src/libgomp/Makefile.in
  search_path = $(addprefix $(top_srcdir)/config/, $(config_path)) $(top_srcdir) \
  	      $(top_srcdir)/../include
  
--fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/finclude
+-fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/finclude
 -libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
-+fincludedir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)/finclude
++fincludedir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/finclude
 +libsubincludedir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)/include
  AM_CPPFLAGS = $(addprefix -I, $(search_path))
  AM_CFLAGS = $(XCFLAGS)
@@ -280,9 +280,9 @@ Index: b/src/libgomp/Makefile.am
  search_path = $(addprefix $(top_srcdir)/config/, $(config_path)) $(top_srcdir) \
  	      $(top_srcdir)/../include
  
--fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/finclude
+-fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/finclude
 -libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
-+fincludedir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)/finclude
++fincludedir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/finclude
 +libsubincludedir = $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)/include
  
  vpath % $(strip $(search_path))
@@ -307,7 +307,7 @@ Index: b/src/libffi/include/Makefile.am
 @@ -8,6 +8,6 @@ EXTRA_DIST=ffi.h.in
  
  # Where generated headers like ffitarget.h get installed.
- gcc_version   := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+ gcc_version   := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
 -toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
 +toollibffidir := $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)/include
  
@@ -319,7 +319,7 @@ Index: b/src/libffi/include/Makefile.in
 @@ -251,7 +251,7 @@ EXTRA_DIST = ffi.h.in
  
  # Where generated headers like ffitarget.h get installed.
- gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+ gcc_version := $(shell @get_gcc_base_ver@ $(top_srcdir)/../gcc/BASE-VER)
 -toollibffidir := $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
 +toollibffidir := $(libdir)/gcc-cross/$(target_alias)/$(gcc_version)/include
  toollibffi_HEADERS = ffi.h ffitarget.h

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git