diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-08-04 20:05:57 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-08-04 20:05:57 +0100 |
| commit | a87d0d6b8bfa400637c56d3194b22fca5cbd6f9e (patch) | |
| tree | 761432665eb6bfa18b129f0bc7b23162bcfd98fc /sys-fs/btrfs-progs/files | |
| parent | 9ec9cbf23e468492eab5e3a31836c699e8c5c534 (diff) | |
gentoo auto-resync : 04:08:2022 - 20:05:57
Diffstat (limited to 'sys-fs/btrfs-progs/files')
| -rw-r--r-- | sys-fs/btrfs-progs/files/btrfs-progs-5.18.1-glibc-2.36.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-5.18.1-glibc-2.36.patch b/sys-fs/btrfs-progs/files/btrfs-progs-5.18.1-glibc-2.36.patch new file mode 100644 index 000000000000..52671ea6c357 --- /dev/null +++ b/sys-fs/btrfs-progs/files/btrfs-progs-5.18.1-glibc-2.36.patch @@ -0,0 +1,31 @@ +https://github.com/kdave/btrfs-progs/commit/46eb32a019834b0a49ae9744db1a921aaa6a3d63 + +From 46eb32a019834b0a49ae9744db1a921aaa6a3d63 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 25 Jul 2022 11:58:35 -0700 +Subject: [PATCH] btrfs-progs: use linux mount.h instead of sys/mount.h + +This file includes linux/fs.h which includes linux/mount.h and with +glibc 2.36 linux/mount.h and glibc mount.h are not compatible [1] +therefore try to avoid including both headers + +[1] https://sourceware.org/glibc/wiki/Release/2.36 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: David Sterba <dsterba@suse.com> +--- + common/device-utils.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/common/device-utils.c b/common/device-utils.c +index 617b67462..25a4fb8c4 100644 +--- a/common/device-utils.c ++++ b/common/device-utils.c +@@ -15,7 +15,6 @@ + */ + + #include <sys/ioctl.h> +-#include <sys/mount.h> + #include <sys/statfs.h> + #include <sys/types.h> + #include <stdio.h> |