[gcc-6] 67/401: * Fix dependency generation for armel/armhf multilib cross targets.

[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 c9a3fae12b903af1228cba1a6265d92bc5ed04bd
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Tue Feb 2 17:21:10 2016 +0000

     * Fix dependency generation for armel/armhf multilib cross targets.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8637 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog  | 1 +
 debian/rules.defs | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ccb0fe6..7e04da8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gcc-6 (6-20160129-1) UNRELEASED; urgency=medium
 
   * GCC 6 snapshot build, taken from the trunk 20160129.
   * Add more conflicts to GCC 5's debug and doc packages. Closes: #813081.
+  * Fix dependency generation for armel/armhf multilib cross targets.
 
  -- Matthias Klose <doko at debian.org>  Fri, 29 Jan 2016 18:48:14 +0100
 
diff --git a/debian/rules.defs b/debian/rules.defs
index edbc3df..bddb42b 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -1963,7 +1963,11 @@ ifeq ($(DEB_CROSS),yes)
   endef
   define cross_mangle_substvars
 	if [ -f debian/$(1).substvars ]; then \
-	  sed -i 's/:$(DEB_TARGET_ARCH)/$(cross_lib_arch)/g' debian/$(1).substvars; \
+	  sed -i \
+	    -e 's/:$(DEB_TARGET_ARCH)/$(cross_lib_arch)/g' \
+	    $(if $(filter armel,$(DEB_TARGET_ARCH)),-e 's/:armhf/-armhf-cross/g') \
+	    $(if $(filter armhf,$(DEB_TARGET_ARCH)),-e 's/:armel/-armel-cross/g') \
+	    debian/$(1).substvars; \
 	fi
   endef
 else

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