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 A9CE915838C for ; Wed, 24 Jan 2024 07:32:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E605D2BC05B; Wed, 24 Jan 2024 07:32:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 BFD8A2BC050 for ; Wed, 24 Jan 2024 07:32:01 +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 E600B343106 for ; Wed, 24 Jan 2024 07:32:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5A308EC0 for ; Wed, 24 Jan 2024 07:31:59 +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: <1706081427.1b57acdd9fe27f7d3f8b41665a52be59146d9e8e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/bcachefs-tools/files/, sys-fs/bcachefs-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/bcachefs-tools/bcachefs-tools-1.4.0.ebuild sys-fs/bcachefs-tools/files/bcachefs-tools-1.4.0-fix-clang-musl.patch X-VCS-Directories: sys-fs/bcachefs-tools/files/ sys-fs/bcachefs-tools/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 1b57acdd9fe27f7d3f8b41665a52be59146d9e8e X-VCS-Branch: master Date: Wed, 24 Jan 2024 07:31:59 +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: 8f33c998-ba24-4540-aa56-cb00ae5a0b67 X-Archives-Hash: c026bcf23d6559dcd8b0116b342d7e23 commit: 1b57acdd9fe27f7d3f8b41665a52be59146d9e8e Author: Christopher Fore posteo net> AuthorDate: Wed Jan 24 04:24:19 2024 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jan 24 07:30:27 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b57acdd sys-fs/bcachefs-tools: fix musl+clang build failure on 1.4.0 - fix-clang-musl.patch Applies fix from upstream to rearrange the variable order All tests pass on glibc and musl. Closes: https://bugs.gentoo.org/921564 Signed-off-by: Christopher Fore posteo.net> Closes: https://github.com/gentoo/gentoo/pull/34983 Signed-off-by: Sam James gentoo.org> sys-fs/bcachefs-tools/bcachefs-tools-1.4.0.ebuild | 4 ++++ .../bcachefs-tools-1.4.0-fix-clang-musl.patch | 24 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/sys-fs/bcachefs-tools/bcachefs-tools-1.4.0.ebuild b/sys-fs/bcachefs-tools/bcachefs-tools-1.4.0.ebuild index ab8af97606ec..a2e67f190904 100644 --- a/sys-fs/bcachefs-tools/bcachefs-tools-1.4.0.ebuild +++ b/sys-fs/bcachefs-tools/bcachefs-tools-1.4.0.ebuild @@ -160,6 +160,10 @@ BDEPEND=" virtual/rust " +PATCHES=( + "${FILESDIR}"/${PN}-1.4.0-fix-clang-musl.patch +) + llvm_check_deps() { has_version -b "sys-devel/clang:${LLVM_SLOT}" } diff --git a/sys-fs/bcachefs-tools/files/bcachefs-tools-1.4.0-fix-clang-musl.patch b/sys-fs/bcachefs-tools/files/bcachefs-tools-1.4.0-fix-clang-musl.patch new file mode 100644 index 000000000000..b011ca1de422 --- /dev/null +++ b/sys-fs/bcachefs-tools/files/bcachefs-tools-1.4.0-fix-clang-musl.patch @@ -0,0 +1,24 @@ +Bug: https://bugs.gentoo.org/921564 +From https://github.com/koverstreet/bcachefs-tools/commit/8e56da27fd23c169395b3b266b15a1c093aba849 + +diff --git a/libbcachefs.c b/libbcachefs.c +index 68b750a..ec6b272 100644 +--- a/libbcachefs.c ++++ b/libbcachefs.c +@@ -445,6 +445,7 @@ struct bchfs_handle bcache_fs_open(const char *path) + */ + struct bchfs_handle bchu_fs_open_by_dev(const char *path, int *idx) + { ++ struct bch_opts opts = bch2_opts_empty(); + char buf[1024], *uuid_str; + + struct stat stat = xstat(path); +@@ -469,8 +470,6 @@ struct bchfs_handle bchu_fs_open_by_dev(const char *path, int *idx) + uuid_str = p + 1; + } else { + read_super: +- struct bch_opts opts = bch2_opts_empty(); +- + opt_set(opts, noexcl, true); + opt_set(opts, nochanges, true); +