[gcc-7] 136/354: * Fix base package name for rtlibs stage build (Helmut Grohne). Closes: #857074.

[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 4075ddbb8fd7cb7f3c2d9ffd8a86d7576aedbaf9
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed Mar 8 15:16:32 2017 +0000

      * Fix base package name for rtlibs stage build (Helmut Grohne).
        Closes: #857074.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9344 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog | 2 ++
 debian/rules2    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a4512c4..829f865 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ gcc-7 (7-20170303-1) UNRELEASED; urgency=medium
 
   * Bump binutils version requirement to 2.28.
   * Fix libcc1.so symlink for cross compilers. Addresses: #856875.
+  * Fix base package name for rtlibs stage build (Helmut Grohne).
+    Closes: #857074.
 
  -- Matthias Klose <doko at debian.org>  Fri, 03 Mar 2017 10:14:38 +0100
 
diff --git a/debian/rules2 b/debian/rules2
index 2225808..227a076 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -1791,7 +1791,8 @@ ifeq ($(versioned_packages),yes)
   pkg_ver := -$(BASE_VERSION)
 endif
 
-ifneq ($(DEB_CROSS),yes)
+# if native or rtlibs build
+ifeq ($(if $(filter yes,$(DEB_CROSS)),$(if $(filter rtlibs,$(DEB_STAGE)),native,cross),native),native)
   p_base = gcc$(pkg_ver)-base
   p_lbase = $(p_base)
   p_xbase = gcc$(pkg_ver)-base

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