gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

sys-fs/bcachefs-tools: fix musl+clang build failure on 1.4.0

Browse Source 
- 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 <csfore@posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/34983
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Christopher Fore
2024-01-23 23:24:19 -05:00
committed by Sam James
parent f2f23264cc
commit 1b57acdd9f
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sys-fs/bcachefs-tools/bcachefs-tools-1.4.0.ebuild
View File

@@ -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}"
}

24
sys-fs/bcachefs-tools/files/bcachefs-tools-1.4.0-fix-clang-musl.patch Normal file
View File

@@ -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);