[clang] Add support for Debian 14 Forky and Debian 15 Duke #138460
Merged
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
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
llvmbot
added
clang
|
@llvm/pr-subscribers-clang-driver @llvm/pr-subscribers-clang Author: Raul Tambre (tambry) ChangesFutureproofs our single Debian-specific special case for roughly the next 6 years. See: https://lists.debian.org/debian-devel-announce/2025/01/msg00004.html Full diff: https://github.com/llvm/llvm-project/pull/138460.diff 2 Files Affected:
diff --git a/clang/include/clang/Driver/Distro.h b/clang/include/clang/Driver/Distro.h
index 9f27c2baaeb47..5c25592e68ade 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,
@@ -129,7 +131,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 82c627819d9fc..90e5a390be7eb 100644
--- a/clang/lib/Driver/Distro.cpp
+++ b/clang/lib/Driver/Distro.cpp
@@ -161,6 +161,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;
}
@@ -174,6 +178,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);
}
|
|
please let me know i should merge it |
|
I have commit access but I'll wait for CI so everything's by the book. 🙂 |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/174/builds/17214 Here is the relevant piece of the build log for the reference |
|
/cherry-pick 58e6883 |
1 similar comment
|
/cherry-pick 58e6883 |
|
/pull-request #138652 |
|
Seems like the cherry-pick only works if the branch of the PR still exists. 🤔 |
Thanks for pointing this out. I faced a similar issue when I deleted the branch and tried cherry picking ! Now that I've restored the branch, should I try cherry picking again ? |
|
@anutosh491 Yep, precisely. That's what I did here. |
|
I did the same and worked pretty smoothly. Thank you :) |
|
Someone probably ought to open an issue for this caveat. |
I don't know who would be responsible for looking into this just yet :| Can we raise something (a quick one liner issue pointing this out) and tag someone responsible for this ? |
That's not my experience with it. It looks like the cherry-pick command yesterday just hit an unrelated issue: https://github.com/llvm/llvm-project/actions/runs/14837157160/job/41650945562 |
|
I presumed the 401 being the error being returned for it trying to query a repo/branch that no longer existed. |
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 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
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 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
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 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
GeorgeARM
pushed a commit
to GeorgeARM/llvm-project
that referenced
this pull request
May 7, 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
swift-ci
pushed a commit
to swiftlang/llvm-project
that referenced
this pull request
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)
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.
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