commit: e2a9a0b1afbd30bbcb23339e9cd870ea435678d5 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Feb 23 06:41:30 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Feb 23 06:41:37 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2a9a0b1
sys-fs/zfs: update musl patch Bug: https://bugs.gentoo.org/925281 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-fs/zfs/files/2.2.3-musl.patch | 41 +++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/sys-fs/zfs/files/2.2.3-musl.patch b/sys-fs/zfs/files/2.2.3-musl.patch index 41ce14633667..01433490e82f 100644 --- a/sys-fs/zfs/files/2.2.3-musl.patch +++ b/sys-fs/zfs/files/2.2.3-musl.patch @@ -1,23 +1,50 @@ https://github.com/openzfs/zfs/pull/15925 -From 3fa84afb3f4334b6609f0dcb141e5d10095e585b Mon Sep 17 00:00:00 2001 +From 68419c70dc7235a4954d6c0c09d60f9ebe694a3c Mon Sep 17 00:00:00 2001 From: Sam James <s...@gentoo.org> Date: Fri, 23 Feb 2024 05:12:09 +0000 -Subject: [PATCH] tests: use <fcntl.h> instead of <sys/fcntl.h> +Subject: [PATCH] Use <fcntl.h> instead of <sys/fcntl.h> When building on musl, we get: ``` In file included from tests/zfs-tests/cmd/getversion.c:22: /usr/include/sys/fcntl.h:1:2: error: #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h> [-Werror=cpp] 1 | #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h> - | ^~~~~~~ -``` -There's some other use of <sys/fcntl.h> in the codebase, but they're on the -module side, where libspl seems to handle it all, so not touching that. +In file included from module/os/linux/zfs/vdev_file.c:36: +/usr/include/sys/fcntl.h:1:2: error: #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h> [-Werror=cpp] + 1 | #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h> +``` Bug: https://bugs.gentoo.org/925235 Signed-off-by: Sam James <s...@gentoo.org> +--- + module/os/linux/zfs/vdev_file.c | 2 +- + tests/zfs-tests/cmd/getversion.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/module/os/linux/zfs/vdev_file.c b/module/os/linux/zfs/vdev_file.c +index 5abc0426d1..68e3042a97 100644 +--- a/module/os/linux/zfs/vdev_file.c ++++ b/module/os/linux/zfs/vdev_file.c +@@ -23,6 +23,7 @@ + * Copyright (c) 2011, 2020 by Delphix. All rights reserved. + */ + ++#include <fcntl.h> + #include <sys/zfs_context.h> + #include <sys/spa.h> + #include <sys/spa_impl.h> +@@ -33,7 +34,6 @@ + #include <sys/fs/zfs.h> + #include <sys/fm/fs/zfs.h> + #include <sys/abd.h> +-#include <sys/fcntl.h> + #include <sys/vnode.h> + #include <sys/zfs_file.h> + #ifdef _KERNEL +diff --git a/tests/zfs-tests/cmd/getversion.c b/tests/zfs-tests/cmd/getversion.c +index 62c1c5b6ab..1e026b92d1 100644 --- a/tests/zfs-tests/cmd/getversion.c +++ b/tests/zfs-tests/cmd/getversion.c @@ -19,9 +19,9 @@ @@ -31,4 +58,6 @@ Signed-off-by: Sam James <s...@gentoo.org> #include <stdio.h> #include <stdlib.h> #include <unistd.h> +-- +2.43.2
