From 641aba831145b61e69b86c9760c2f424b80aeda9 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 15 Feb 2016 18:48:03 +0000 Subject: [PATCH] Compile with gcc-5 on all architectures --- debian/changelog | 1 + debian/config/amd64/defines | 1 - debian/config/armel/defines | 2 +- debian/config/armhf/defines | 2 +- debian/config/defines | 4 +--- debian/config/hppa/defines | 2 +- debian/config/i386/defines | 1 - debian/config/m68k/defines | 1 - debian/config/s390x/defines | 2 +- debian/templates/control.extra.in | 12 ++++++------ 10 files changed, 12 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 38f4977e5..34da3da5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ linux (4.5~rc4-1~exp1) UNRELEASED; urgency=medium [ Ben Hutchings ] * [rt] Disable until it is updated for 4.5 or later * aufs: Update support patches to aufs4.x-rcN-20160215 + * Compile with gcc-5 on all architectures -- Roger Shimizu Sun, 14 Feb 2016 00:32:40 +0900 diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines index 649a067b5..9a3ed7f30 100644 --- a/debian/config/amd64/defines +++ b/debian/config/amd64/defines @@ -1,5 +1,4 @@ [base] -compiler: gcc-5 featuresets: none rt diff --git a/debian/config/armel/defines b/debian/config/armel/defines index cae0f9eb6..70798d5fa 100644 --- a/debian/config/armel/defines +++ b/debian/config/armel/defines @@ -15,7 +15,7 @@ configs: install-stem: vmlinuz [relations] -headers%gcc-4.9: linux-compiler-gcc-4.9-arm +headers%gcc-5: linux-compiler-gcc-5-arm [marvell_description] hardware: Marvell Kirkwood/Orion diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines index 8f7551f04..d8b1fa929 100644 --- a/debian/config/armhf/defines +++ b/debian/config/armhf/defines @@ -15,7 +15,7 @@ configs: install-stem: vmlinuz [relations] -headers%gcc-4.9: linux-compiler-gcc-4.9-arm +headers%gcc-5: linux-compiler-gcc-5-arm [armmp_description] hardware: ARMv7 multiplatform compatible SoCs diff --git a/debian/config/defines b/debian/config/defines index ec784fd74..a2fe96cf4 100644 --- a/debian/config/defines +++ b/debian/config/defines @@ -26,7 +26,7 @@ arches: sparc sparc64 x32 -compiler: gcc-4.9 +compiler: gcc-5 featuresets: none rt @@ -45,8 +45,6 @@ initramfs-generators: initramfs-tools initramfs-fallback [relations] # compilers -gcc-4.8: gcc-4.8 -gcc-4.9: gcc-4.9 gcc-5: gcc-5 # initramfs-generators diff --git a/debian/config/hppa/defines b/debian/config/hppa/defines index b8572021c..aa79a1af9 100644 --- a/debian/config/hppa/defines +++ b/debian/config/hppa/defines @@ -22,5 +22,5 @@ hardware: multiprocessor 64-bit PA-RISC hardware-long: HP PA-RISC 64-bit SMP systems with support for more than 4 GB RAM [relations] -gcc-4.9: gcc-4.9 , binutils-hppa64 , gcc-4.9-hppa64 +gcc-5: gcc-5 , binutils-hppa64 , gcc-5-hppa64-linux-gnu diff --git a/debian/config/i386/defines b/debian/config/i386/defines index 14f3b86ab..b988c322a 100644 --- a/debian/config/i386/defines +++ b/debian/config/i386/defines @@ -1,5 +1,4 @@ [base] -compiler: gcc-5 featuresets: none rt diff --git a/debian/config/m68k/defines b/debian/config/m68k/defines index 28a85e012..d5cddc958 100644 --- a/debian/config/m68k/defines +++ b/debian/config/m68k/defines @@ -1,5 +1,4 @@ [base] -compiler: gcc-4.8 cflags: -ffreestanding flavours: m68k diff --git a/debian/config/s390x/defines b/debian/config/s390x/defines index 30d86c99f..517ed75d1 100644 --- a/debian/config/s390x/defines +++ b/debian/config/s390x/defines @@ -13,7 +13,7 @@ configs: install-stem: vmlinuz [relations] -headers%gcc-4.9: linux-compiler-gcc-4.9-s390 +headers%gcc-5: linux-compiler-gcc-5-s390 [s390x_build] debug-info: true diff --git a/debian/templates/control.extra.in b/debian/templates/control.extra.in index c48546ffc..da3142977 100644 --- a/debian/templates/control.extra.in +++ b/debian/templates/control.extra.in @@ -1,19 +1,19 @@ -Package: linux-compiler-gcc-4.9-arm +Package: linux-compiler-gcc-5-arm Build-Profiles: -Depends: gcc-4.9, ${misc:Depends} +Depends: gcc-5, ${misc:Depends} Architecture: armel armhf Multi-Arch: foreign Description: Compiler for Linux on ARM (meta-package) - This package depends on gcc 4.9 of the appropriate architecture for + This package depends on gcc 5 of the appropriate architecture for Linux on armel and armhf. -Package: linux-compiler-gcc-4.9-s390 +Package: linux-compiler-gcc-5-s390 Build-Profiles: -Depends: gcc-4.9, ${misc:Depends} +Depends: gcc-5, ${misc:Depends} Architecture: s390 s390x Multi-Arch: foreign Description: Compiler for Linux on IBM zSeries (meta-package) - This package depends on gcc 4.9 of the appropriate architecture for + This package depends on gcc 5 of the appropriate architecture for Linux on s390 and s390x. Package: linux-compiler-gcc-5-x86