Package: cross-gcc-dev
Version: 113
Severity: important
Tags: patch
The cross-gcc-dev that made it into the stable release (113) was
prepared against gcc-6 6.3.0-2, whereas the version of gcc that ended
up released was 6.3.0-18, and one patch does not apply, rendering the
package largely useless. (I didn't check gcc-5/7)
A small update is needed to
gcc-6/0010-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch
attached is both the updated version of that patch and a diff from
the existing to new (whichever is more convenient for you).
-- System Information:
Debian Release: 8.8
APT prefers oldstable-updates
APT policy: (500, 'oldstable-updates'), (500, 'oldstable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.16.0-4-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--- /usr/share/cross-gcc/patches/gcc-6/0010-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch.orig 2017-01-01 01:36:10.000000000 +0000
+++ /usr/share/cross-gcc/patches/gcc-6/0010-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch 2017-06-22 01:57:12.882279388 +0000
@@ -26,8 +26,8 @@
+define(`SOFTBASEDEP', `BASEPKG (>= ${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})')
+define(`BASELDEP', `BASEPKG (>= ${gcc:Version})')
+define(`SOFTBASELDEP', `BASEPKG (>= ${gcc:SoftVersion})')
',`dnl
@@ -42,6 +42,3 @@
Architecture: any
Multi-Arch: same
Section: ifdef(`TARGET',`devel',`libs')
---
-2.11.0
-
>From ecdfaf898f28b9f4176eb93088b6a360f3d40785 Mon Sep 17 00:00:00 2001
From: Dima Kogan <d...@secretsauce.net>
Date: Tue, 26 May 2015 01:12:13 -0700
Subject: [PATCH 10/11] gcc-...-base dependencies reverted to gcc-VER-base when
using wdotap
Before gcc 5.1.1-7 the debian gcc build was creating dependencies on
gcc-VER-base. As of 5.1.1-7 we get dependencies on gcc-VER-ARCH-base instead.
Here I revert to the old-style deps when using wdotap
---
debian/control.m4 | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/debian/control.m4 b/debian/control.m4
index c1437d7..5701ac1 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -122,12 +122,13 @@ Description: SNAPSHOT of the GNU Compiler Collection
',`dnl gcc-X.Y
dnl default base package dependencies
-define(`BASEDEP', `gcc`'PV`'TS-base (= ${gcc:Version})')
-define(`SOFTBASEDEP', `gcc`'PV`'TS-base (>= ${gcc:SoftVersion})')
+define(`BASEPKG', `gcc`'PV`'ifdef(`CROSS_ARCH', ifelse(CROSS_ARCH, `all', `TS'))-base')
+define(`BASEDEP', `BASEPKG (= ${gcc:Version})')
+define(`SOFTBASEDEP', `BASEPKG (>= ${gcc:SoftVersion})')
ifdef(`TARGET',`
-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})')
+define(`BASELDEP', `BASEPKG (>= ${gcc:Version})')
+define(`SOFTBASELDEP', `BASEPKG (>= ${gcc:SoftVersion})')
',`dnl
define(`BASELDEP', `BASEDEP')
define(`SOFTBASELDEP', `SOFTBASEDEP')
@@ -146,7 +147,7 @@ define(`SOFTBASEDEP', `gnat`'PV-base (>= ${gnat:SoftVersion})')
')
ifenabled(`gccbase',`
-Package: gcc`'PV`'TS-base
+Package: BASEPKG
Architecture: any
Multi-Arch: same
Section: ifdef(`TARGET',`devel',`libs')
