Add noble as supported Ubuntu release

This commit is contained in:
Steve Langasek 2023-10-31 22:54:40 +01:00 committed by Gianfranco Costamagna
parent 93413979ab
commit 2840ec0456
2 changed files with 14 additions and 10 deletions

2
debian/changelog vendored
View File

@ -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 <locutusofborg@debian.org> Wed, 25 Oct 2023 08:10:35 +0200

View File

@ -3,36 +3,38 @@ Forwarded: no
Author: Graham Inggs <ginggs@debian.org>
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;
}