Source: gcc-7
Severity: normal

Dear Maintainer,

When attempting to build gcc-7 for ia64, the package tries to require libunwind7
when the current version is libunwind8.  The attached patch should correct this.

Jason
diff -u gcc-7-7.2.0/debian/control gcc-7-7.2.0/debian/control
--- gcc-7-7.2.0/debian/control
+++ gcc-7-7.2.0/debian/control
@@ -9,7 +9,7 @@
   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 mipsn32el mips64 mips64el s390x sparc64 x32], libn32gcc1 [mips mipsel mips64 mips64el], lib64gcc1 [i386 mips mipsel mipsn32 mipsn32el powerpc sparc s390 x32], libc6-dev-mips64 [mips mipsel mipsn32 mipsn32el], libc6-dev-mipsn32 [mips mipsel mips64 mips64el], libc6-dev-mips32 [mipsn32 mipsn32el mips64 mips64el], libc6-dev-x32 [amd64 i386], libx32gcc1 [amd64 i386], libc6.1-dbg [alpha ia64] | libc0.3-dbg [hurd-i386] | libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64] | libc6-dbg, 
   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 -u gcc-7-7.2.0/debian/control.m4 gcc-7-7.2.0/debian/control.m4
--- gcc-7-7.2.0/debian/control.m4
+++ gcc-7-7.2.0/debian/control.m4
@@ -74,7 +74,7 @@
   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 -u gcc-7-7.2.0/debian/rules.conf gcc-7-7.2.0/debian/rules.conf
--- gcc-7-7.2.0/debian/rules.conf
+++ gcc-7-7.2.0/debian/rules.conf
@@ -373,11 +373,13 @@
   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))

Reply via email to