Bug#788497: cross-gcc: also use gcc-5-base for libraries
YunQiang Su <[email protected]>
| Newsgroups | gmane.linux.debian.devel.toolchain |
|---|---|
| Message-ID | <CAKcpw6VXew_R1kBoD+nCAEB3Y0kBaBXK5=AJZQxhZeMcxy47WQ__37340.4696154923$1434057150$gmane$org@mail.gmail.com> |
Package: src:cross-gcc Version: 35 Please also don't include TS in BASELDEP and SOFTBASELDEP. They are used for libraries, such as libgcc1 etc. cross-gcc-<arch> don't ship libraries, it is not matter for it, while when bootstrap for a new architecture[1], it will matter. [1]: https://wiki.debian.org/MultiarchCrossToolchainBootstrap -- YunQiang Su
0010-gcc-.-base-dependencies-reverted-to-gcc-VER-base-whe.patch
(application/octet-stream, 1.2 KB)
--- /home/syq/xxxx/gcc-5-5.1.1/debian/control.m4 2015-06-12 02:52:23.000000000 +0800
+++ debian/control.m4 2015-06-12 04:58:01.034723084 +0800
@@ -119,12 +119,12 @@
',`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(`BASEDEP', `gcc`'PV`'ifdef(`CROSS_ARCH',,TS)-base (= ${gcc:Version})')
+define(`SOFTBASEDEP', `gcc`'PV`'ifdef(`CROSS_ARCH',,TS)-base (>= ${gcc:SoftVersion})')
ifdef(`TARGET',`
-define(`BASELDEP', `gcc`'PV`'TS-base (>= ${gcc:Version})')
-define(`SOFTBASELDEP', `gcc`'PV`'TS-base (>= ${gcc:SoftVersion})')
+define(`BASELDEP', `gcc`'PV`'ifdef(`CROSS_ARCH',,TS)-base (>= ${gcc:Version})')
+define(`SOFTBASELDEP', `gcc`'PV`'ifdef(`CROSS_ARCH',,TS)-base (>= ${gcc:SoftVersion})')
',`dnl
define(`BASELDEP', `BASEDEP')
define(`SOFTBASELDEP', `SOFTBASEDEP')
@@ -143,8 +143,8 @@
')
ifenabled(`gccbase',`
-Package: gcc`'PV`'TS-base
-Architecture: any
+Package: gcc`'PV`'ifdef(`CROSS_ARCH',,TS)-base
+Architecture: ifdef(`CROSS_ARCH',`CROSS_ARCH',any)
Multi-Arch: same
Section: ifdef(`TARGET',`devel',`libs')
Priority: ifdef(`TARGET',`extra',`PRI(required)')