[gcc-6] 193/401: * Fix install location of D header files for cross builds (YunQiang Su). Closes: #835847.

[Ximin Luo]

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

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit eba9a9820563b5ba0ecde7a946808b71dc0889ae
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Mon Aug 29 08:46:37 2016 +0000

      * Fix install location of D header files for cross builds (YunQiang Su).
        Closes: #835847.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8957 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                               |  2 ++
 debian/patches/gdc-cross-install-location.diff | 26 +++++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c0266e8..eb855e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ gcc-6 (6.2.0-2) UNRELEASED; urgency=medium
 
   * Call default_file_start from s390_asm_file_start, taken from the trunk.
   * Update multiarch patches for mips* r6 (YunQiang Su).
+  * Fix install location of D header files for cross builds (YunQiang Su).
+    Closes: #835847.
 
  -- Matthias Klose <doko at debian.org>  Wed, 24 Aug 2016 08:07:34 +0200
 
diff --git a/debian/patches/gdc-cross-install-location.diff b/debian/patches/gdc-cross-install-location.diff
index 21d4e92..d4d112a 100644
--- a/debian/patches/gdc-cross-install-location.diff
+++ b/debian/patches/gdc-cross-install-location.diff
@@ -1,13 +1,21 @@
-Index: b/src/libphobos/configure.ac
-===================================================================
 --- a/src/libphobos/configure.ac
 +++ b/src/libphobos/configure.ac
-@@ -167,7 +167,7 @@ AC_SUBST(phobos_toolexecdir)
- AC_SUBST(phobos_toolexeclibdir)
+@@ -94,6 +94,7 @@
+ DRUNTIME_LIBBACKTRACE_SETUP
+ DRUNTIME_INSTALL_DIRECTORIES
+ DRUNTIME_VERSION
++# trigger rebuild of the configure file
  
- # Default case for install directory for D sources files.
--gdc_include_dir='${libdir}/gcc/${target_alias}'/${d_gcc_ver}/include/d
-+gdc_include_dir='${libdir}/gcc-cross/${target_alias}'/${d_gcc_ver}/include/d
- AC_SUBST(gdc_include_dir)
+ # Set default flags (after DRUNTIME_WERROR!)
+ if test -z "$DFLAGS"; then
+--- a/src/libphobos/m4/druntime.m4
++++ b/src/libphobos/m4/druntime.m4
+@@ -78,7 +78,7 @@ AC_DEFUN([DRUNTIME_INSTALL_DIRECTORIES],
+   AC_SUBST(toolexeclibdir)
+ 
+   # Default case for install directory for D sources files.
+-  gdc_include_dir='${libdir}/gcc/${target_alias}'/${d_gcc_ver}/include/d
++  gdc_include_dir='${libdir}/gcc-cross/${target_alias}'/${d_gcc_ver}/include/d
+   AC_SUBST(gdc_include_dir)
+ ])
  
- dnl Checks for header files.

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