[gcc-7] 332/354: * Bump libunwind (build-)dependency for ia64. Closes: #879959.

[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 cebb0fe85af6f922b15706104b4974759e402546
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Tue Oct 31 06:16:28 2017 +0000

      * Bump libunwind (build-)dependency for ia64. Closes: #879959.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9789 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog  | 1 +
 debian/control    | 2 +-
 debian/control.m4 | 2 +-
 debian/rules.conf | 4 +++-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 791ab6e..7103062 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ gcc-7 (7.2.0-13) UNRELEASED; urgency=medium
       PR c/82234, PR target/82703 (x86), PR c++/82085, PR c++/82373,
       PR fortran/81758, PR libgfortran/81938.
     - Fix subminor version number. Closes: #879823.
+  * Bump libunwind (build-)dependency for ia64. Closes: #879959.
 
  -- Matthias Klose <doko at debian.org>  Tue, 31 Oct 2017 06:10:36 +0100
 
diff --git a/debian/control b/debian/control
index fd32f91..ee72b15 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9.20141010), dpkg-dev (>= 1.17.14),
   libc6.1-dev (>= 2.13-5) [alpha ia64] | libc0.3-dev (>= 2.13-5) [hurd-i386] | libc0.1-dev (>= 2.13-5) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= 2.13-5), libc6-dev (>= 2.13-31) [armel armhf], libc6-dev-amd64 [i386 x32], libc6-dev-sparc64 [sparc], libc6-dev-sparc [sparc64], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64 x32], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 mipsn32 mi [...]
   kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any], linux-libc-dev [m68k], 
   m4, libtool, autoconf2.64, 
-  libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], 
+  libunwind8-dev [ia64], libatomic-ops-dev [ia64], 
   autogen <!nocheck>, gawk, lzma, xz-utils, patchutils, 
   zlib1g-dev, systemtap-sdt-dev [linux-any kfreebsd-any hurd-any], 
   binutils:native (>= 2.29.1) | binutils-multiarch:native (>= 2.29.1), binutils-hppa64-linux-gnu:native (>= 2.29.1) [hppa amd64 i386 x32], 
diff --git a/debian/control.m4 b/debian/control.m4
index 12daa6e..a4bc8c1 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -74,7 +74,7 @@ Build-Depends: DEBHELPER_BUILD_DEP DPKG_BUILD_DEP
   LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP LIBC_DBG_DEP
   kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any], linux-libc-dev [m68k],
   AUTO_BUILD_DEP BASE_BUILD_DEP
-  libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64],
+  libunwind8-dev [ia64], libatomic-ops-dev [ia64],
   autogen <!nocheck>, gawk, lzma, xz-utils, patchutils,
   zlib1g-dev, SDT_BUILD_DEP
   BINUTILS_BUILD_DEP,
diff --git a/debian/rules.conf b/debian/rules.conf
index 9795d48..c6c52df 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -373,11 +373,13 @@ ifneq (,$(multilib_archs))
   GCC_MULTILIB_BUILD_DEP = g++-multilib [$(multilib_archs)]$(pf_ncross),
 endif
 
-LIBUNWIND_DEV_DEP := libunwind7-dev$(LS)$(AQ) (>= 0.98.5-6)
+LIBUNWIND_DEV_DEP := libunwind8-dev$(LS)$(AQ)
 LIBUNWIND_BUILD_DEP := $(LIBUNWIND_DEV_DEP) [ia64],
 LIBATOMIC_OPS_BUILD_DEP := libatomic-ops-dev$(LS) [ia64],
 ifneq ($(DEB_TARGET_ARCH),ia64)
   LIBUNWIND_DEV_DEP := # nothing
+else ifneq (,$(filter $(DEB_STAGE),stage1 stage2))
+  LIBUNWIND_DEV_DEP := # nothing
 endif
 
 ifneq (,$(filter $(distrelease),lenny etch squeeze dapper hardy jaunty karmic lucid maverick natty))

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