[gcc-7] 144/354: * Allow bootstrapping with libc headers installed in multiarch location. (Helmut Grohne). Closes: #857535.

[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 a99ce757b8058bd716d574e1770bb982edefa83b
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Tue Mar 14 12:52:35 2017 +0000

      * Allow bootstrapping with libc headers installed in multiarch location.
        (Helmut Grohne). Closes: #857535.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9358 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                  |  2 ++
 debian/patches/gcc-multiarch.diff | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2c56251..1492e5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ gcc-7 (7-20170314-1) experimental; urgency=medium
   * Fix symlinks to man pages in the hppa64 package. Addresses: #857583.
   * Don't ship the gnatgcc manpage symlink when building GFDL packages.
     Addresses: #857384.
+  * Allow bootstrapping with libc headers installed in multiarch location.
+    (Helmut Grohne). Closes: #857535.
 
   [ Nicolas Boulenguez ]
   * Create the libgnatsvn packages again. Closes: #857606.
diff --git a/debian/patches/gcc-multiarch.diff b/debian/patches/gcc-multiarch.diff
index f7d49cd..7768a6c 100644
--- a/debian/patches/gcc-multiarch.diff
+++ b/debian/patches/gcc-multiarch.diff
@@ -203,3 +203,14 @@ Index: b/src/gcc/config/tilegx/t-tilegx
  
  LIBGCC = stmp-multilib
  INSTALL_LIBGCC = install-multilib
+--- a/src/gcc/Makefile.in
++++ b/src/gcc/Makefile.in
+@@ -494,7 +494,7 @@
+ STMP_FIXINC = @STMP_FIXINC@
+
+ # Test to see whether <limits.h> exists in the system header files.
+-LIMITS_H_TEST = [ -f $(BUILD_SYSTEM_HEADER_DIR)/limits.h ]
++LIMITS_H_TEST = [ -f $(BUILD_SYSTEM_HEADER_DIR)/limits.h -o -f $(BUILD_SYSTEM_HEADER_DIR)/$(MULTIARCH_DIRNAME)/limits.h ]
+
+ # Directory for prefix to system directories, for
+ # each of $(system_prefix)/usr/include, $(system_prefix)/usr/lib, etc.

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