Merge branch '17' into snapshot

This commit is contained in:
Gianfranco Costamagna 2023-10-31 23:03:22 +01:00
commit 47c0b0ebf8
3 changed files with 47 additions and 2 deletions

10
debian/changelog vendored
View File

@ -8,13 +8,17 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED;
* Rename lldb-vscode => lldb-dap * Rename lldb-vscode => lldb-dap
* Ship tblgen-to-irdl as part of mlir-tools * Ship tblgen-to-irdl as part of mlir-tools
llvm-toolchain-17 (1:17.0.3-1~exp2) UNRELEASED; urgency=medium llvm-toolchain-17 (1:17.0.4-1) unstable; urgency=medium
[ Matthias Klose ] [ Matthias Klose ]
* Limit the number of parallel processes based on the available memory * Limit the number of parallel processes based on the available memory
and the packages to be built (flang has some memory hogs). and the packages to be built (flang has some memory hogs).
-- Matthias Klose <doko@debian.org> Wed, 18 Oct 2023 15:00:25 +0200 [ Sylvestre Ledru ]
* New supstream release
* Upload to unstable
-- Sylvestre Ledru <sylvestre@debian.org> Tue, 31 Oct 2023 11:39:22 +0100
llvm-toolchain-17 (1:17.0.3-1~exp1) experimental; urgency=medium llvm-toolchain-17 (1:17.0.3-1~exp1) experimental; urgency=medium
@ -215,6 +219,8 @@ llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental
llvm-toolchain-16 (1:16.0.6-18) UNRELEASED; urgency=medium llvm-toolchain-16 (1:16.0.6-18) UNRELEASED; urgency=medium
* Upload to sid * Upload to sid
[ Steve Langasek ]
* Add noble as supported Ubuntu release
-- Gianfranco Costamagna <locutusofborg@debian.org> Wed, 25 Oct 2023 08:10:35 +0200 -- Gianfranco Costamagna <locutusofborg@debian.org> Wed, 25 Oct 2023 08:10:35 +0200

View File

@ -145,3 +145,4 @@ unwind-force-pthread-dl.diff
force-sse2-compiler-rt.diff force-sse2-compiler-rt.diff
bolt-disable-emit-relocs.patch bolt-disable-emit-relocs.patch
link-grpc.diff link-grpc.diff
ubuntu-releases.patch

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

@ -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-17-17.0.3/clang/include/clang/Driver/Distro.h
===================================================================
--- llvm-toolchain-17-17.0.3.orig/clang/include/clang/Driver/Distro.h
+++ llvm-toolchain-17-17.0.3/clang/include/clang/Driver/Distro.h
@@ -78,6 +78,7 @@
UbuntuKinetic,
UbuntuLunar,
UbuntuMantic,
+ UbuntuNoble,
UnknownDistro
};
@@ -129,7 +130,7 @@
}
bool IsUbuntu() const {
- return DistroVal >= UbuntuHardy && DistroVal <= UbuntuMantic;
+ return DistroVal >= UbuntuHardy && DistroVal <= UbuntuNoble;
}
bool IsAlpineLinux() const { return DistroVal == AlpineLinux; }
Index: llvm-toolchain-17-17.0.3/clang/lib/Driver/Distro.cpp
===================================================================
--- llvm-toolchain-17-17.0.3.orig/clang/lib/Driver/Distro.cpp
+++ llvm-toolchain-17-17.0.3/clang/lib/Driver/Distro.cpp
@@ -94,6 +94,7 @@
.Case("kinetic", Distro::UbuntuKinetic)
.Case("lunar", Distro::UbuntuLunar)
.Case("mantic", Distro::UbuntuMantic)
+ .Case("noble", Distro::UbuntuNoble)
.Default(Distro::UnknownDistro);
return Version;
}