diff --git a/debian/changelog b/debian/changelog index 75a997346..85712cf94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ linux (4.3~rc7-1~exp2) UNRELEASED; urgency=medium [ Ben Hutchings ] * netfilter: Enable NFT_DUP_IPV4, NFT_DUP_IPV6 as modules (Closes: #803370) * tests: Add autopkgtest support + * [x86] Compile with gcc-5 [ Salvatore Bonaccorso ] * Fix typo in image.plain.postinst template. diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines index ea197ee68..1598f1249 100644 --- a/debian/config/amd64/defines +++ b/debian/config/amd64/defines @@ -1,4 +1,5 @@ [base] +compiler: gcc-5 featuresets: none rt @@ -14,7 +15,7 @@ configs: install-stem: vmlinuz [relations] -headers%gcc-4.9: linux-compiler-gcc-4.9-x86 +headers%gcc-5: linux-compiler-gcc-5-x86 [amd64_description] hardware: 64-bit PCs diff --git a/debian/config/defines b/debian/config/defines index f03709a2c..283bcd7fa 100644 --- a/debian/config/defines +++ b/debian/config/defines @@ -50,6 +50,7 @@ gcc-4.6: gcc-4.6 gcc-4.7: gcc-4.7 gcc-4.8: gcc-4.8 gcc-4.9: gcc-4.9 +gcc-5: gcc-5 # initramfs-generators initramfs-fallback: linux-initramfs-tool diff --git a/debian/config/i386/defines b/debian/config/i386/defines index e5345e603..dcec36868 100644 --- a/debian/config/i386/defines +++ b/debian/config/i386/defines @@ -1,4 +1,5 @@ [base] +compiler: gcc-5 featuresets: none rt @@ -19,7 +20,7 @@ configs: install-stem: vmlinuz [relations] -headers%gcc-4.9: linux-compiler-gcc-4.9-x86 +headers%gcc-5: linux-compiler-gcc-5-x86 [686_description] hardware: older PCs diff --git a/debian/templates/control.extra.in b/debian/templates/control.extra.in index 30aa11a6a..8841020f2 100644 --- a/debian/templates/control.extra.in +++ b/debian/templates/control.extra.in @@ -14,10 +14,10 @@ Description: Compiler for Linux on IBM zSeries (meta-package) This package depends on gcc 4.8 of the appropriate architecture for Linux on s390 and s390x. -Package: linux-compiler-gcc-4.9-x86 -Depends: gcc-4.9, ${misc:Depends} +Package: linux-compiler-gcc-5-x86 +Depends: gcc-5, ${misc:Depends} Architecture: amd64 i386 x32 Multi-Arch: foreign Description: Compiler for Linux on x86 (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 amd64, i386 and x32.