From Graham Inggs, update ubuntu releases codenames to include Ubuntu mantic

This commit is contained in:
Gianfranco Costamagna 2023-06-11 09:26:56 +02:00
parent 26c6756792
commit 11244f6040
3 changed files with 45 additions and 0 deletions

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
llvm-toolchain-15 (1:15.0.7-5~exp3) UNRELEASED; urgency=medium
[ Graham Inggs ]
* debian/patches/ubuntu-releases.patch: Update the list of
Ubuntu release names
-- Gianfranco Costamagna <locutusofborg@debian.org> Sun, 11 Jun 2023 09:26:23 +0200
llvm-toolchain-15 (1:15.0.7-5~exp2) experimental; urgency=medium llvm-toolchain-15 (1:15.0.7-5~exp2) experimental; urgency=medium
* Also apply the workround of issue #62621 for focal * Also apply the workround of issue #62621 for focal

View File

@ -162,3 +162,4 @@ link-grpc.diff
amdgpu/nonlinux.patch amdgpu/nonlinux.patch
amdgpu/usr-search-paths.patch amdgpu/usr-search-paths.patch
amdgpu/bitcode-multiarch.patch amdgpu/bitcode-multiarch.patch
ubuntu-releases.patch

36
debian/patches/ubuntu-releases.patch vendored Normal file
View File

@ -0,0 +1,36 @@
Description: Update the list of Ubuntu release names
Forwarded: no
Author: Graham Inggs <ginggs@debian.org>
Last-Update: 2023-04-29
--- a/clang/include/clang/Driver/Distro.h
+++ b/clang/include/clang/Driver/Distro.h
@@ -76,6 +76,8 @@
UbuntuImpish,
UbuntuJammy,
UbuntuKinetic,
+ UbuntuLunar,
+ UbuntuMantic,
UnknownDistro
};
@@ -127,7 +129,7 @@
}
bool IsUbuntu() const {
- return DistroVal >= UbuntuHardy && DistroVal <= UbuntuKinetic;
+ return DistroVal >= UbuntuHardy && DistroVal <= UbuntuMantic;
}
bool IsAlpineLinux() const { return DistroVal == AlpineLinux; }
--- a/clang/lib/Driver/Distro.cpp
+++ b/clang/lib/Driver/Distro.cpp
@@ -92,6 +92,8 @@
.Case("impish", Distro::UbuntuImpish)
.Case("jammy", Distro::UbuntuJammy)
.Case("kinetic", Distro::UbuntuKinetic)
+ .Case("lunar", Distro::UbuntuLunar)
+ .Case("mantic", Distro::UbuntuMantic)
.Default(Distro::UnknownDistro);
return Version;
}