[gcc-7] 162/354: * Fix dependency on gcc-base package for rtlibs stage build (Helmut Grohne). Closes: #859938.

[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 e1e1cbfc0c8d9ef8d8f91fd66b6428b510ac0643
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Tue May 2 14:18:10 2017 +0000

      * Fix dependency on gcc-base package for rtlibs stage build (Helmut Grohne).
        Closes: #859938.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9419 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog  | 2 ++
 debian/control.m4 | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e79e510..59b755c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ gcc-7 (7-20170502-1) UNRELEASED; urgency=medium
   * Update gdc to the gdc-7 branch 20170502.
   * Add multiarch bits for non-glibc architectures (musl, uclibc) (Helmut
     Grohne). Closes: #861588.
+  * Fix dependency on gcc-base package for rtlibs stage build (Helmut Grohne).
+    Closes: #859938.
 
  -- Matthias Klose <doko at debian.org>  Tue, 02 May 2017 11:40:02 +0200
 
diff --git a/debian/control.m4 b/debian/control.m4
index 760b4f4..2331ddc 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -126,8 +126,8 @@ define(`BASEDEP', `gcc`'PV`'TS-base (= ${gcc:Version})')
 define(`SOFTBASEDEP', `gcc`'PV`'TS-base (>= ${gcc:SoftVersion})')
 
 ifdef(`TARGET',`
-define(`BASELDEP', `gcc`'PV-cross-base`'GCC_PORTS_BUILD (= ${gcc:Version})')
-define(`SOFTBASELDEP', `gcc`'PV-cross-base`'GCC_PORTS_BUILD (>= ${gcc:SoftVersion})')
+define(`BASELDEP', `gcc`'PV`'ifelse(CROSS_ARCH,`all',`-cross')-base`'GCC_PORTS_BUILD (= ${gcc:Version})')
+define(`SOFTBASELDEP', `gcc`'PV`'ifelse(CROSS_ARCH, `all',`-cross')-base`'GCC_PORTS_BUILD (>= ${gcc:SoftVersion})')
 ',`dnl
 define(`BASELDEP', `BASEDEP')
 define(`SOFTBASELDEP', `SOFTBASEDEP')

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