[gcc-6] 36/401: * Fix libgcc1-0 dependency for cross compilers.

[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 22bf10d65ab2901f4f035d459019ce877d6de326
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Tue Jan 5 16:13:53 2016 +0000

      * Fix libgcc1-0 dependency for cross compilers.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8566 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog  | 3 ++-
 debian/rules.conf | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6540eb3..a692fc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 gcc-6 (6-20160103-2) UNRELEASED; urgency=medium
 
   * Install new header file pkuintrin.h. Closes: #809807.
+  * Fix libgcc1-0 dependency for cross compilers.
 
- -- Matthias Klose <doko at debian.org>  Mon, 04 Jan 2016 13:16:33 +0100
+ -- Matthias Klose <doko at debian.org>  Tue, 05 Jan 2016 17:13:26 +0100
 
 gcc-6 (6-20160103-1) experimental; urgency=medium
 
diff --git a/debian/rules.conf b/debian/rules.conf
index 5615a97..8a7fb47 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -612,9 +612,9 @@ NEXT_GCC_VERSION := $(shell echo $(GCC_VERSION) | \
 		awk -F. '{OFS="."; if (NF==2) $$3=1; else $$NF += 1; print}')
 # first version with a new path component in gcc_lib_dir (i.e. GCC_VERSION
 # or TARGET_ALIAS changes), or last version available for all architectures
-DEB_GCC_SOFT_VERSION := 5.2.1-23
-DEB_GCJ_SOFT_VERSION := 5.2.1-23
-DEB_GNAT_SOFT_VERSION := 5.2.1-23
+DEB_GCC_SOFT_VERSION := 6-20160103-1
+DEB_GCJ_SOFT_VERSION := 6-20160103-1
+DEB_GNAT_SOFT_VERSION := 6-20160103-1
 
 ifeq ($(with_d),yes)
   GDC_VERSION := $(BASE_VERSION)
@@ -1287,7 +1287,7 @@ ifeq ($(with_libphobos),yes)
 endif
 ifeq ($(with_cc1),yes)
   ifneq (,$(findstring build-cross, $(build_type)))
-	echo 'dep:libcc1=libcc1-$(CC1_SONAME) (>= $(GCC_VERSION))' \
+	echo 'dep:libcc1=libcc1-$(CC1_SONAME) (>= $${gcc:SoftVersion})' \
 		>> debian/substvars.local.tmp
   else
 	echo 'dep:libcc1=libcc1-$(CC1_SONAME) (>= $${gcc:Version})' \

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