From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 490A8158041 for ; Fri, 23 Feb 2024 06:42:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7FFBDE2A45; Fri, 23 Feb 2024 06:42:22 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 63940E2A45 for ; Fri, 23 Feb 2024 06:42:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 530CD3431F3 for ; Fri, 23 Feb 2024 06:42:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B7F85B2F for ; Fri, 23 Feb 2024 06:42:19 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1708670497.e2a9a0b1afbd30bbcb23339e9cd870ea435678d5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zfs/files/2.2.3-musl.patch X-VCS-Directories: sys-fs/zfs/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e2a9a0b1afbd30bbcb23339e9cd870ea435678d5 X-VCS-Branch: master Date: Fri, 23 Feb 2024 06:42:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c2acc84f-9120-4423-8cae-f00a6fa2cdaa X-Archives-Hash: 1c4859fb58335979face2417f83ccfed commit: e2a9a0b1afbd30bbcb23339e9cd870ea435678d5 Author: Sam James gentoo org> AuthorDate: Fri Feb 23 06:41:30 2024 +0000 Commit: Sam James gentoo 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 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 Date: Fri, 23 Feb 2024 05:12:09 +0000 -Subject: [PATCH] tests: use instead of +Subject: [PATCH] Use instead of 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 to [-Werror=cpp] 1 | #warning redirecting incorrect #include to - | ^~~~~~~ -``` -There's some other use of 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 to [-Werror=cpp] + 1 | #warning redirecting incorrect #include to +``` Bug: https://bugs.gentoo.org/925235 Signed-off-by: Sam James +--- + 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 + #include + #include + #include +@@ -33,7 +34,6 @@ + #include + #include + #include +-#include + #include + #include + #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 #include #include #include +-- +2.43.2