From 2840ec0456c215b220fc3ad3bb71ad262bc53a90 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Tue, 31 Oct 2023 22:54:40 +0100 Subject: [PATCH] Add noble as supported Ubuntu release --- debian/changelog | 2 ++ debian/patches/ubuntu-releases.patch | 22 ++++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index e0fb3b52..deaa92ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ llvm-toolchain-16 (1:16.0.6-18) UNRELEASED; urgency=medium * Upload to sid + [ Steve Langasek ] + * Add noble as supported Ubuntu release -- Gianfranco Costamagna Wed, 25 Oct 2023 08:10:35 +0200 diff --git a/debian/patches/ubuntu-releases.patch b/debian/patches/ubuntu-releases.patch index 8b2bec1c..cc8303ca 100644 --- a/debian/patches/ubuntu-releases.patch +++ b/debian/patches/ubuntu-releases.patch @@ -3,36 +3,38 @@ Forwarded: no Author: Graham Inggs Last-Update: 2023-04-29 -Index: llvm-toolchain-16-16.0.5/clang/include/clang/Driver/Distro.h +Index: llvm-toolchain-16-16.0.6/clang/include/clang/Driver/Distro.h =================================================================== ---- llvm-toolchain-16-16.0.5.orig/clang/include/clang/Driver/Distro.h -+++ llvm-toolchain-16-16.0.5/clang/include/clang/Driver/Distro.h -@@ -77,6 +77,7 @@ +--- llvm-toolchain-16-16.0.6.orig/clang/include/clang/Driver/Distro.h ++++ llvm-toolchain-16-16.0.6/clang/include/clang/Driver/Distro.h +@@ -77,6 +77,8 @@ UbuntuJammy, UbuntuKinetic, UbuntuLunar, + UbuntuMantic, ++ UbuntuNoble, UnknownDistro }; -@@ -128,7 +129,7 @@ +@@ -128,7 +130,7 @@ } bool IsUbuntu() const { - return DistroVal >= UbuntuHardy && DistroVal <= UbuntuLunar; -+ return DistroVal >= UbuntuHardy && DistroVal <= UbuntuMantic; ++ return DistroVal >= UbuntuHardy && DistroVal <= UbuntuNoble; } bool IsAlpineLinux() const { return DistroVal == AlpineLinux; } -Index: llvm-toolchain-16-16.0.5/clang/lib/Driver/Distro.cpp +Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/Distro.cpp =================================================================== ---- llvm-toolchain-16-16.0.5.orig/clang/lib/Driver/Distro.cpp -+++ llvm-toolchain-16-16.0.5/clang/lib/Driver/Distro.cpp -@@ -93,6 +93,7 @@ +--- llvm-toolchain-16-16.0.6.orig/clang/lib/Driver/Distro.cpp ++++ llvm-toolchain-16-16.0.6/clang/lib/Driver/Distro.cpp +@@ -93,6 +93,8 @@ .Case("jammy", Distro::UbuntuJammy) .Case("kinetic", Distro::UbuntuKinetic) .Case("lunar", Distro::UbuntuLunar) + .Case("mantic", Distro::UbuntuMantic) ++ .Case("noble", Distro::UbuntuNoble) .Default(Distro::UnknownDistro); return Version; }