Bug#963254: gcc-10: d/rules.def, set AQ to :all for cross build
Hi,
On Sun, Jun 21, 2020 at 09:10:48PM +0800, YunQiang Su wrote:
> The major problem is Depends: libgcc-10-dev-i386-cross:amd64 (>=
> 10.1.0-3cross1) but it is not installable
> we need to mark gcc-10-i686-linux-gnu depends on
> libgcc-10-dev-i386-cross:all to solve this problem.
Can you try applying the attached patch?
Helmut
diff --minimal -Nru gcc-10-10.1.0/debian/control gcc-10-10.1.0/debian/control
--- gcc-10-10.1.0/debian/control 2020-05-15 15:11:57.000000000 +0200
+++ gcc-10-10.1.0/debian/control 2020-06-24 00:17:56.000000000 +0200
@@ -265,6 +265,7 @@
Package: gcc-10-hppa64-linux-gnu
Architecture: hppa amd64 i386 x32
+Multi-Arch: foreign
Section: devel
Priority: optional
Depends: gcc-10-base (= ${gcc:Version}), gcc-10 (= ${gcc:Version}),
diff --minimal -Nru gcc-10-10.1.0/debian/control.m4 gcc-10-10.1.0/debian/control.m4
--- gcc-10-10.1.0/debian/control.m4 2020-05-11 13:38:42.000000000 +0200
+++ gcc-10-10.1.0/debian/control.m4 2020-06-24 00:17:56.000000000 +0200
@@ -107,6 +107,8 @@
ifelse(regexp(SRCNAME, `gcc-snapshot'),0,`dnl
Package: gcc-snapshot`'TS
Architecture: any
+ifelse(TS,`',`',`Multi-Arch: foreign
+')dnl
Section: devel
Priority: optional
Depends: binutils`'TS (>= ${binutils:Version}),
@@ -187,6 +189,8 @@
Package: gnat`'PV-base`'TS
Architecture: any
# "all" causes build instabilities for "any" dependencies (see #748388).
+ifelse(TS,`',`',`Multi-Arch: foreign
+')dnl
Section: libs
Priority: PRI(optional)
Depends: ${misc:Depends}
@@ -998,7 +1002,7 @@
ifenabled(`cdev',`
Package: gcc`'PV`'TS
Architecture: any
-ifdef(`TARGET',`Multi-Arch: foreign
+ifelse(TS,`',`',`Multi-Arch: foreign
')dnl
Section: devel
Priority: optional
@@ -1037,7 +1041,7 @@
ifenabled(`multilib',`
Package: gcc`'PV-multilib`'TS
Architecture: ifdef(`TARGET',`any',MULTILIB_ARCHS)
-ifdef(`TARGET',`Multi-Arch: foreign
+ifelse(TS,`',`',`Multi-Arch: foreign
')dnl
Section: devel
Priority: optional
@@ -1066,7 +1070,7 @@
ifenabled(`plugindev',`
Package: gcc`'PV-plugin-dev`'TS
Architecture: any
-ifdef(`TARGET',`Multi-Arch: foreign
+ifelse(TS,`',`',`Multi-Arch: foreign
')dnl
Section: devel
Priority: optional
@@ -1082,8 +1086,7 @@
ifenabled(`cdev',`
Package: gcc`'PV-hppa64-linux-gnu
Architecture: ifdef(`TARGET',`any',hppa amd64 i386 x32)
-ifdef(`TARGET',`Multi-Arch: foreign
-')dnl
+Multi-Arch: foreign
Section: devel
Priority: PRI(optional)
Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}),
@@ -1097,7 +1100,7 @@
ifenabled(`cdev',`
Package: cpp`'PV`'TS
Architecture: any
-ifdef(`TARGET',`Multi-Arch: foreign
+ifelse(TS,`',`',`Multi-Arch: foreign
')dnl
Section: ifdef(`TARGET',`devel',`interpreters')
Priority: optional
@@ -1148,7 +1151,7 @@
ifenabled(`c++dev',`
Package: g++`'PV`'TS
Architecture: any
-ifdef(`TARGET',`Multi-Arch: foreign
+ifelse(TS,`',`',`Multi-Arch: foreign
')dnl
Section: devel
Priority: optional
@@ -1166,7 +1169,7 @@
ifenabled(`multilib',`
Package: g++`'PV-multilib`'TS
Architecture: ifdef(`TARGET',`any',MULTILIB_ARCHS)
-ifdef(`TARGET',`Multi-Arch: foreign
+ifelse(TS,`',`',`Multi-Arch: foreign
')dnl
Section: devel
Priority: optional
@@ -3290,7 +3293,7 @@
ifenabled(`objppdev',`
Package: gobjc++`'PV`'TS
Architecture: any
-ifdef(`TARGET',`Multi-Arch: foreign
+ifelse(TS,`',`',`Multi-Arch: foreign
')dnl
Priority: optional
Depends: BASEDEP, gobjc`'PV`'TS (= ${gcc:Version}), g++`'PV`'TS (= ${gcc:Version}), ${shlibs:Depends}, libidevdep(objc`'PV-dev,,=), ${misc:Depends}
@@ -3306,7 +3309,7 @@
ifenabled(`multilib',`
Package: gobjc++`'PV-multilib`'TS
Architecture: ifdef(`TARGET',`any',MULTILIB_ARCHS)
-ifdef(`TARGET',`Multi-Arch: foreign
+ifelse(TS,`',`',`Multi-Arch: foreign
')dnl
Section: devel
Priority: optional
@@ -3325,7 +3328,7 @@
ifenabled(`objcdev',`
Package: gobjc`'PV`'TS
Architecture: any
-ifdef(`TARGET',`Multi-Arch: foreign
+ifelse(TS,`',`',`Multi-Arch: foreign
')dnl
Priority: optional
Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, libidevdep(objc`'PV-dev,,=), ${misc:Depends}
@@ -3341,7 +3344,7 @@
ifenabled(`multilib',`
Package: gobjc`'PV-multilib`'TS
Architecture: ifdef(`TARGET',`any',MULTILIB_ARCHS)
-ifdef(`TARGET',`Multi-Arch: foreign
+ifelse(TS,`',`',`Multi-Arch: foreign
')dnl
Section: devel
Priority: optional
@@ -3629,7 +3632,7 @@
ifenabled(`fdev',`
Package: gfortran`'PV`'TS
Architecture: any
-ifdef(`TARGET',`Multi-Arch: foreign
+ifelse(TS,`',`',`Multi-Arch: foreign
')dnl
Priority: optional
Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), libidevdep(gfortran`'PV-dev,,=), ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends}
@@ -3647,7 +3650,7 @@
ifenabled(`multilib',`
Package: gfortran`'PV-multilib`'TS
Architecture: ifdef(`TARGET',`any',MULTILIB_ARCHS)
-ifdef(`TARGET',`Multi-Arch: foreign
+ifelse(TS,`',`',`Multi-Arch: foreign
')dnl
Section: devel
Priority: optional
@@ -3959,7 +3962,7 @@
ifenabled(`godev',`
Package: gccgo`'PV`'TS
Architecture: any
-ifdef(`TARGET',`Multi-Arch: foreign
+ifelse(TS,`',`',`Multi-Arch: foreign
')dnl
Priority: optional
Depends: BASEDEP, ifdef(`STANDALONEGO',`${dep:libcc1}, ',`gcc`'PV`'TS (= ${gcc:Version}), ')libidevdep(go`'PV-dev,,>=), ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends}
@@ -3975,7 +3978,7 @@
ifenabled(`multilib',`
Package: gccgo`'PV-multilib`'TS
Architecture: ifdef(`TARGET',`any',MULTILIB_ARCHS)
-ifdef(`TARGET',`Multi-Arch: foreign
+ifelse(TS,`',`',`Multi-Arch: foreign
')dnl
Section: devel
Priority: optional
@@ -4832,7 +4835,7 @@
ifenabled(`ada',`
Package: gnat`'-GNAT_V`'TS
Architecture: any
-ifdef(`TARGET',`Multi-Arch: foreign
+ifelse(TS,`',`',`Multi-Arch: foreign
')dnl
Priority: optional
ifdef(`MULTIARCH', `Pre-Depends: ${misc:Pre-Depends}
@@ -4855,7 +4858,7 @@
ifenabled(`adasjlj',`
Package: gnat`'-GNAT_V-sjlj`'TS
Architecture: any
-ifdef(`TARGET',`Multi-Arch: foreign
+ifelse(TS,`',`',`Multi-Arch: foreign
')dnl
Priority: optional
ifdef(`MULTIARCH', `Pre-Depends: ${misc:Pre-Depends}
@@ -5021,7 +5024,7 @@
ifenabled(`d ',`
Package: gdc`'PV`'TS
Architecture: any
-ifdef(`TARGET',`Multi-Arch: foreign
+ifelse(TS,`',`',`Multi-Arch: foreign
')dnl
Priority: optional
Depends: SOFTBASEDEP, g++`'PV`'TS (>= ${gcc:SoftVersion}), ${dep:gdccross}, ${dep:phobosdev}, ${shlibs:Depends}, ${misc:Depends}
@@ -5038,7 +5041,7 @@
ifenabled(`multilib',`
Package: gdc`'PV-multilib`'TS
Architecture: any
-ifdef(`TARGET',`Multi-Arch: foreign
+ifelse(TS,`',`',`Multi-Arch: foreign
')dnl
Priority: optional
Depends: SOFTBASEDEP, gdc`'PV`'TS (= ${gcc:Version}), gcc`'PV-multilib`'TS (= ${gcc:Version}), ${dep:libphobosbiarchdev}${shlibs:Depends}, ${misc:Depends}
@@ -5366,7 +5369,7 @@
ifenabled(`m2 ',`
Package: gm2`'PV`'TS
Architecture: any
-ifdef(`TARGET',`Multi-Arch: foreign
+ifelse(TS,`',`',`Multi-Arch: foreign
')dnl
Priority: optional
Depends: SOFTBASEDEP, g++`'PV`'TS (>= ${gcc:SoftVersion}), libidevdep(gm2`'PV-dev,,=), ${shlibs:Depends}, ${misc:Depends}
@@ -5380,7 +5383,7 @@
ifenabled(`multigm2lib',`
Package: gm2`'PV-multilib`'TS
Architecture: any
-ifdef(`TARGET',`Multi-Arch: foreign
+ifelse(TS,`',`',`Multi-Arch: foreign
')dnl
Priority: optional
Depends: SOFTBASEDEP, gm2`'PV`'TS (= ${gcc:Version}), gcc`'PV-multilib`'TS (= ${gcc:Version}), ${dep:libgm2biarchdev}${shlibs:Depends}, ${misc:Depends}
@@ -5660,7 +5663,7 @@
ifenabled(`brigdev',`
Package: gccbrig`'PV`'TS
Architecture: any
-ifdef(`TARGET',`Multi-Arch: foreign
+ifelse(TS,`',`',`Multi-Arch: foreign
')dnl
Priority: optional
Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), ${dep:libcdev},
@@ -5678,7 +5681,7 @@
ifenabled(`multiXXXlib',`
Package: gccbrig`'PV-multilib`'TS
Architecture: ifdef(`TARGET',`any',MULTILIB_ARCHS)
-ifdef(`TARGET',`Multi-Arch: foreign
+ifelse(TS,`',`',`Multi-Arch: foreign
')dnl
Section: devel
Priority: optional
Reply to: