Bug#666743: gcc-for-host fixes
Hi Matthias,
a while ago, you reviewed my last patch iteration and had a few remarks.
This is a summary of the remaining issues.
In https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666743#65, you
complained about linking the doc directory of the new triple-suffixed
gdc package to the base package. In subsequent mails, I detailed why I
think this is not a problem.
In https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666743#70, you
complained about missing package in dpkg-genchanges. This is due to a
wrong Architecture field fixed in 0001 attached. Thanks.
In https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666743#85, you
complained about a loosely versioned dependeny on gdc fixed in 0002
attached. Thanks.
Thus this mail covers all remaining issues with two patches. I've based
them on your gcc-host branch as requested.
Helmut
>From fc5dda64d5903d7c6dcc6b695a3d2a2a7d8a727c Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Wed, 23 Sep 2020 21:50:56 +0200
Subject: [PATCH 1/2] fix architecture field of per-architecture packages
Reported-by: Matthias Klose <doko@debian.org>
---
debian/control.m4 | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/debian/control.m4 b/debian/control.m4
index 9d85323..2659bf7 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -3354,7 +3354,7 @@ ifenabled(`objpp',`
ifenabled(`objppdev',`
for_each_arch(`
Package: gobjc++`'PV`'arch_gnusuffix
-Architecture: any
+Architecture: ifdef(`TARGET',`any',arch_deb)
Multi-Arch: foreign
Priority: optional
Depends: BASEDEP, gobjc`'PV`'arch_gnusuffix (= ${gcc:Version}), g++`'PV`'arch_gnusuffix (= ${gcc:Version}), ${shlibs:Depends}, libidevdep(objc`'PV-dev,,=), ${misc:Depends}
@@ -3404,7 +3404,7 @@ ifenabled(`objc',`
ifenabled(`objcdev',`
for_each_arch(`
Package: gobjc`'PV`'arch_gnusuffix
-Architecture: any
+Architecture: ifdef(`TARGET',`any',arch_deb)
Multi-Arch: foreign
Priority: optional
Depends: BASEDEP, gcc`'PV`'arch_gnusuffix (= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, libidevdep(objc`'PV-dev,,=), ${misc:Depends}
@@ -3721,7 +3721,7 @@ ifenabled(`fortran',`
ifenabled(`fdev',`dnl
for_each_arch(`
Package: gfortran`'PV`'arch_gnusuffix
-Architecture: any
+Architecture: ifdef(`TARGET',`any',arch_deb)
Multi-Arch: foreign
Priority: optional
Depends: BASEDEP, gcc`'PV`'arch_gnusuffix (= ${gcc:Version}), libidevdep(gfortran`'PV-dev,,=), ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends}
@@ -5140,7 +5140,7 @@ Description: GNU Ada compiler (documentation)
ifenabled(`d ',`dnl
for_each_arch(`
Package: gdc`'PV`'arch_gnusuffix
-Architecture: any
+Architecture: ifdef(`TARGET',`any',arch_deb)
Multi-Arch: foreign
Priority: optional
Depends: SOFTBASEDEP, g++`'PV`'arch_gnusuffix (>= ${gcc:Version}), ${dep:gdccross}, ${dep:phobosdev}, ${shlibs:Depends}, ${misc:Depends}
@@ -5499,7 +5499,7 @@ Description: Phobos D standard library (debug symbols)
ifenabled(`m2 ',`dnl
for_each_arch(`
Package: gm2`'PV`'arch_gnusuffix
-Architecture: any
+Architecture: ifdef(`TARGET',`any',arch_deb)
Multi-Arch: foreign
Priority: optional
Depends: SOFTBASEDEP, g++`'PV`'arch_gnusuffix (>= ${gcc:Version}), ${dep:gm2cross}, libidevdep(gm2`'PV-dev,,=), ${shlibs:Depends}, ${misc:Depends}
--
2.28.0
>From b8139863760604abfe2c96688fa3e0bb28917fb2 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Wed, 23 Sep 2020 21:52:34 +0200
Subject: [PATCH 2/2] fix version of gdc-N -> gdc-N-triplet dependency
Reported-by: Matthias Klose <doko@debian.org>
---
debian/control.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control.m4 b/debian/control.m4
index 2659bf7..e837cb2 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -5158,7 +5158,7 @@ ifdef(`TARGET',`',`
Package: gdc`'PV
Architecture: any
Priority: optional
-Depends: gdc`'PV`'${target:suffix} (= ${gcc:SoftVersion}), SOFTBASEDEP, g++`'PV (>= ${gcc:SoftVersion}), ${dep:gdccross}, ${misc:Depends}
+Depends: gdc`'PV`'${target:suffix} (= ${gcc:Version}), SOFTBASEDEP, g++`'PV (>= ${gcc:SoftVersion}), ${dep:gdccross}, ${misc:Depends}
Provides: gdc, d-compiler, d-v2-compiler
Replaces: gdc (<< 4.4.6-5)
Description: GNU D compiler (version 2)
--
2.28.0
Reply to: