Cherry-pick patch from Graham Inggs to actually also understand Ubuntu mantic release

diff --git a/debian/changelog b/debian/changelog
index b824b600e5b5cb0906b0376da550ca4c4577dae8..5e1006c570bc35126c5176b4b92330f6b67cb81b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-16 (1:16.0.5-1~exp2) UNRELEASED; urgency=medium
+
+  * Add patch from llvm-15 (Graham Inggs) to update Ubuntu releases names
+    to include Ubuntu mantic
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 11 Jun 2023 09:32:08 +0200
+
 llvm-toolchain-16 (1:16.0.5-1~exp1) experimental; urgency=medium
 
   * New upstream release

diff --git a/debian/patches/series b/debian/patches/series
index 5735066f2012b19f46335718971a924797f57e48..9da956cd4901dabbcc70f936ee319c2399d56402 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -151,3 +151,4 @@ link-grpc.diff
 
 amdgpu/nonlinux.patch
 #amdgpu/bitcode-multiarch.patch
+ubuntu-releases.patch

diff --git a/debian/patches/ubuntu-releases.patch b/debian/patches/ubuntu-releases.patch
new file mode 100644 (file)
index 0000000..8b2bec1
--- /dev/null
+++ b/debian/patches/ubuntu-releases.patch
@@ -0,0 +1,38 @@
+Description: Update the list of Ubuntu release names
+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
+===================================================================
+--- 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 @@
+     UbuntuJammy,
+     UbuntuKinetic,
+     UbuntuLunar,
++    UbuntuMantic,
+     UnknownDistro
+   };
+ 
+@@ -128,7 +129,7 @@
+   }
+ 
+   bool IsUbuntu() const {
+-    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuLunar;
++    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuMantic;
+   }
+ 
+   bool IsAlpineLinux() const { return DistroVal == AlpineLinux; }
+Index: llvm-toolchain-16-16.0.5/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 @@
+                     .Case("jammy", Distro::UbuntuJammy)
+                     .Case("kinetic", Distro::UbuntuKinetic)
+                     .Case("lunar", Distro::UbuntuLunar)
++                    .Case("mantic", Distro::UbuntuMantic)
+                     .Default(Distro::UnknownDistro);
+   return Version;
+ }