mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-07-22 15:09:04 +02:00
2cd85ecfc7
Release: - https://ziglang.org/download/0.13.0/release-notes.html - https://github.com/ziglang/zig/releases/tag/0.13.0 Closes: https://bugs.gentoo.org/933854 Co-authored-by: Jean-Baptiste "Jiboo" Lepesme <lepesme.jb@gmail.com> Signed-off-by: Aliaksei Urbanski <aliaksei.urbanski@gmail.com> Signed-off-by: Sam James <sam@gentoo.org>
28 lines
1.3 KiB
Diff
28 lines
1.3 KiB
Diff
# https://github.com/ziglang/zig/pull/20001
|
|
# https://github.com/Jiboo/zig/commit/856fe4af
|
|
|
|
Author: Jean-Baptiste "Jiboo" Lepesme <lepesme.jb@gmail.com>
|
|
Date: Sun, 19 May 2024 15:02:42 +0200
|
|
|
|
IoUring: fix an issue in tests where InvalidVersion might get thrown by
|
|
skipKernelLessThan, due to some kernel versions not being SemVer compliant.
|
|
|
|
diff --git a/lib/std/os/linux/IoUring.zig b/lib/std/os/linux/IoUring.zig
|
|
index 3bf3c077fc3b..b2a4da486907 100644
|
|
--- a/lib/std/os/linux/IoUring.zig
|
|
+++ b/lib/std/os/linux/IoUring.zig
|
|
@@ -3883,7 +3883,13 @@ inline fn skipKernelLessThan(required: std.SemanticVersion) !void {
|
|
}
|
|
|
|
const release = mem.sliceTo(&uts.release, 0);
|
|
- var current = try std.SemanticVersion.parse(release);
|
|
+ // Strips potential extra, as kernel version might not be semver compliant, example "6.8.9-300.fc40.x86_64"
|
|
+ const extra_index = std.mem.indexOfAny(u8, release, "-+");
|
|
+ const stripped = release[0..(extra_index orelse release.len)];
|
|
+ // Make sure the input don't rely on the extra we just stripped
|
|
+ try testing.expect(required.pre == null and required.build == null);
|
|
+
|
|
+ var current = try std.SemanticVersion.parse(stripped);
|
|
current.pre = null; // don't check pre field
|
|
if (required.order(current) == .gt) return error.SkipZigTest;
|
|
}
|