release/20.x: [clang] Add support for Debian 14 Forky and Debian 15 Duke (#138460) #138652
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@sylvestre What do you think about merging this PR to the release branch? |
|
@llvm/pr-subscribers-clang-driver Author: None (llvmbot) ChangesBackport 58e6883 Requested by: @tambry Full diff: https://github.com/llvm/llvm-project/pull/138652.diff 2 Files Affected:
diff --git a/clang/include/clang/Driver/Distro.h b/clang/include/clang/Driver/Distro.h
index b4d485dac8a26..c544a8c002191 100644
--- a/clang/include/clang/Driver/Distro.h
+++ b/clang/include/clang/Driver/Distro.h
@@ -39,6 +39,8 @@ class Distro {
DebianBullseye,
DebianBookworm,
DebianTrixie,
+ DebianForky,
+ DebianDuke,
Exherbo,
RHEL5,
RHEL6,
@@ -128,7 +130,7 @@ class Distro {
bool IsOpenSUSE() const { return DistroVal == OpenSUSE; }
bool IsDebian() const {
- return DistroVal >= DebianLenny && DistroVal <= DebianTrixie;
+ return DistroVal >= DebianLenny && DistroVal <= DebianDuke;
}
bool IsUbuntu() const {
diff --git a/clang/lib/Driver/Distro.cpp b/clang/lib/Driver/Distro.cpp
index 3cc79535de8da..71ba71fa18379 100644
--- a/clang/lib/Driver/Distro.cpp
+++ b/clang/lib/Driver/Distro.cpp
@@ -160,6 +160,10 @@ static Distro::DistroType DetectDistro(llvm::vfs::FileSystem &VFS) {
return Distro::DebianBookworm;
case 13:
return Distro::DebianTrixie;
+ case 14:
+ return Distro::DebianForky;
+ case 15:
+ return Distro::DebianDuke;
default:
return Distro::UnknownDistro;
}
@@ -173,6 +177,8 @@ static Distro::DistroType DetectDistro(llvm::vfs::FileSystem &VFS) {
.Case("bullseye/sid", Distro::DebianBullseye)
.Case("bookworm/sid", Distro::DebianBookworm)
.Case("trixie/sid", Distro::DebianTrixie)
+ .Case("forky/sid", Distro::DebianForky)
+ .Case("duke/sid", Distro::DebianDuke)
.Default(Distro::UnknownDistro);
}
|
|
@llvm/pr-subscribers-clang Author: None (llvmbot) ChangesBackport 58e6883 Requested by: @tambry Full diff: https://github.com/llvm/llvm-project/pull/138652.diff 2 Files Affected:
diff --git a/clang/include/clang/Driver/Distro.h b/clang/include/clang/Driver/Distro.h
index b4d485dac8a26..c544a8c002191 100644
--- a/clang/include/clang/Driver/Distro.h
+++ b/clang/include/clang/Driver/Distro.h
@@ -39,6 +39,8 @@ class Distro {
DebianBullseye,
DebianBookworm,
DebianTrixie,
+ DebianForky,
+ DebianDuke,
Exherbo,
RHEL5,
RHEL6,
@@ -128,7 +130,7 @@ class Distro {
bool IsOpenSUSE() const { return DistroVal == OpenSUSE; }
bool IsDebian() const {
- return DistroVal >= DebianLenny && DistroVal <= DebianTrixie;
+ return DistroVal >= DebianLenny && DistroVal <= DebianDuke;
}
bool IsUbuntu() const {
diff --git a/clang/lib/Driver/Distro.cpp b/clang/lib/Driver/Distro.cpp
index 3cc79535de8da..71ba71fa18379 100644
--- a/clang/lib/Driver/Distro.cpp
+++ b/clang/lib/Driver/Distro.cpp
@@ -160,6 +160,10 @@ static Distro::DistroType DetectDistro(llvm::vfs::FileSystem &VFS) {
return Distro::DebianBookworm;
case 13:
return Distro::DebianTrixie;
+ case 14:
+ return Distro::DebianForky;
+ case 15:
+ return Distro::DebianDuke;
default:
return Distro::UnknownDistro;
}
@@ -173,6 +177,8 @@ static Distro::DistroType DetectDistro(llvm::vfs::FileSystem &VFS) {
.Case("bullseye/sid", Distro::DebianBullseye)
.Case("bookworm/sid", Distro::DebianBookworm)
.Case("trixie/sid", Distro::DebianTrixie)
+ .Case("forky/sid", Distro::DebianForky)
+ .Case("duke/sid", Distro::DebianDuke)
.Default(Distro::UnknownDistro);
}
|
sylvestre
approved these changes
May 9, 2025
Futureproofs our single Debian-specific special case for roughly the next 6 years. See: https://lists.debian.org/debian-devel-announce/2025/01/msg00004.html (cherry picked from commit 58e6883)
|
@tambry (or anyone else). If you would like to add a note about this fix in the release notes (completely optional). Please reply to this comment with a one or two sentence description of the fix. When you are done, please add the release:note label to this PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport 58e6883
Requested by: @tambry