diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-08-03 13:50:40 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-08-03 13:50:40 +0100 |
commit | a2c1a301b2ea85c230b30ef69ff667f230a1bf88 (patch) | |
tree | 72b20e59998ee19c32c86634c05e02790faaf20f /app-arch/libarchive/files | |
parent | 24d75f43d3d4caf76f2448bb277e89a3b3ae0d99 (diff) |
gentoo auto-resync : 03:08:2022 - 13:50:40
Diffstat (limited to 'app-arch/libarchive/files')
-rw-r--r-- | app-arch/libarchive/files/libarchive-3.6.1-glibc-2.36.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/app-arch/libarchive/files/libarchive-3.6.1-glibc-2.36.patch b/app-arch/libarchive/files/libarchive-3.6.1-glibc-2.36.patch deleted file mode 100644 index e45d891e2a17..000000000000 --- a/app-arch/libarchive/files/libarchive-3.6.1-glibc-2.36.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://github.com/libarchive/libarchive/pull/1761 -https://bugs.gentoo.org/863227 - -From a2f68263a1da5ad227bcb9cd8fa91b93c8b6c99f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -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 ---- 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 <sys/param.h> - #endif --#ifdef HAVE_SYS_MOUNT_H --#include <sys/mount.h> --#endif - #ifdef HAVE_SYS_STAT_H - #include <sys/stat.h> - #endif -@@ -54,6 +51,8 @@ __FBSDID("$FreeBSD$"); - #endif - #ifdef HAVE_LINUX_FS_H - #include <linux/fs.h> -+#elif HAVE_SYS_MOUNT_H -+#include <sys/mount.h> - #endif - /* - * Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h. - |