[gcc-6] 68/401: * Fix libc dependency generation for 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 24ed382930cf231772dc54b69a129edc94949b6e
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Thu Feb 4 12:15:38 2016 +0000

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

diff --git a/debian/changelog b/debian/changelog
index 7e04da8..91e891e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,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.
+  * Fix libc dependency generation for 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 bddb42b..0fd49f6 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -1965,6 +1965,7 @@ ifeq ($(DEB_CROSS),yes)
 	if [ -f debian/$(1).substvars ]; then \
 	  sed -i \
 	    -e 's/:$(DEB_TARGET_ARCH)/$(cross_lib_arch)/g' \
+	    -e 's/\(libc[.0-9]*-[^:]*\):\([a-z0-9-]*\)/\1-\2-cross/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; \

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