From cfb4767098b56a21746da583babadf9ba2900da7 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 6 Nov 2022 17:27:31 +0100 Subject: [PATCH] libarchive: Backport build fix for glibc 2.36 This backports a build fix for libarchive when compiling against glibc 2.36. Signed-off-by: Hauke Mehrtens --- ...s-mount.h-when-linux-fs.h-is-present.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 libs/libarchive/patches/001-libarchive-Do-not-include-sys-mount.h-when-linux-fs.h-is-present.patch diff --git a/libs/libarchive/patches/001-libarchive-Do-not-include-sys-mount.h-when-linux-fs.h-is-present.patch b/libs/libarchive/patches/001-libarchive-Do-not-include-sys-mount.h-when-linux-fs.h-is-present.patch new file mode 100644 index 0000000000..812e451c24 --- /dev/null +++ b/libs/libarchive/patches/001-libarchive-Do-not-include-sys-mount.h-when-linux-fs.h-is-present.patch @@ -0,0 +1,39 @@ +From a2f68263a1da5ad227bcb9cd8fa91b93c8b6c99f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 25 Jul 2022 10:56:53 -0700 +Subject: [PATCH] libarchive: Do not include sys/mount.h when linux/fs.h is + present + +These headers are in conflict and only one is needed by +archive_read_disk_posix.c therefore include linux/fs.h if it exists +otherwise include sys/mount.h + +It also helps compiling with glibc 2.36 +where sys/mount.h conflicts with linux/mount.h see [1] + +[1] https://sourceware.org/glibc/wiki/Release/2.36 +--- + libarchive/archive_read_disk_posix.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +--- a/libarchive/archive_read_disk_posix.c ++++ b/libarchive/archive_read_disk_posix.c +@@ -34,9 +34,6 @@ __FBSDID("$FreeBSD$"); + #ifdef HAVE_SYS_PARAM_H + #include + #endif +-#ifdef HAVE_SYS_MOUNT_H +-#include +-#endif + #ifdef HAVE_SYS_STAT_H + #include + #endif +@@ -54,6 +51,8 @@ __FBSDID("$FreeBSD$"); + #endif + #ifdef HAVE_LINUX_FS_H + #include ++#elif HAVE_SYS_MOUNT_H ++#include + #endif + /* + * Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h. -- 2.30.2