From 06c6a832b243f015d14d2325748590de7f7091e9 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 10 May 2018 09:57:21 +0200 Subject: [PATCH] Add Ubuntu Cosmic to supported distro (from Adam Conrad) --- debian/changelog | 7 +++++ debian/patches/series | 1 + debian/patches/ubuntu-cosmic-support.patch | 33 ++++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 debian/patches/ubuntu-cosmic-support.patch diff --git a/debian/changelog b/debian/changelog index 17dfa3c1..def67c61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-snapshot (1:7~svn330801-1~exp3) UNRELEASED; urgency=medium + + * Add ubuntu cosmic to Ubuntu supported releases + + + -- Gianfranco Costamagna Thu, 10 May 2018 10:00:03 +0200 + llvm-toolchain-snapshot (1:7~svn330801-1~exp2) experimental; urgency=medium * d/p/force-gcc-header-obj.diff Fix the detection of the objc path diff --git a/debian/patches/series b/debian/patches/series index 6f82213f..448eef42 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -51,3 +51,4 @@ remove-test-freezing.diff 0048-Set-html_static_path-_static-everywhere.patch 0049-Use-Debian-provided-MathJax-everywhere.patch impl-path-hurd.diff +ubuntu-cosmic-support.patch diff --git a/debian/patches/ubuntu-cosmic-support.patch b/debian/patches/ubuntu-cosmic-support.patch new file mode 100644 index 00000000..50f1bf20 --- /dev/null +++ b/debian/patches/ubuntu-cosmic-support.patch @@ -0,0 +1,33 @@ +Description: Add Ubuntu Cosmic to the distro release list. +Author: Adam Conrad +Last-Update: 2018-05-03 + +--- llvm-toolchain-6.0-6.0.orig/clang/include/clang/Driver/Distro.h ++++ llvm-toolchain-6.0-6.0/clang/include/clang/Driver/Distro.h +@@ -61,6 +61,7 @@ public: + UbuntuZesty, + UbuntuArtful, + UbuntuBionic, ++ UbuntuCosmic, + UnknownDistro + }; + +@@ -114,7 +115,7 @@ public: + } + + bool IsUbuntu() const { +- return DistroVal >= UbuntuHardy && DistroVal <= UbuntuBionic; ++ return DistroVal >= UbuntuHardy && DistroVal <= UbuntuCosmic; + } + + bool IsAlpineLinux() const { +--- llvm-toolchain-6.0-6.0.orig/clang/lib/Driver/Distro.cpp ++++ llvm-toolchain-6.0-6.0/clang/lib/Driver/Distro.cpp +@@ -49,6 +49,7 @@ static Distro::DistroType DetectDistro(v + .Case("zesty", Distro::UbuntuZesty) + .Case("artful", Distro::UbuntuArtful) + .Case("bionic", Distro::UbuntuBionic) ++ .Case("cosmic", Distro::UbuntuCosmic) + .Default(Distro::UnknownDistro); + if (Version != Distro::UnknownDistro) + return Version;