diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-08-17 02:31:41 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-08-17 02:31:41 +0100 |
| commit | 91e1f8a90b85372d757efd9a1fb7dd1685ea6b50 (patch) | |
| tree | ebeff59a4470abb242c47417f217e36e21fe6a0c /net-fs/autofs/files | |
| parent | ae99f3df3fb5c7ebb085d4a198c1854a4c9a1bee (diff) | |
gentoo auto-resync : 17:08:2022 - 02:31:41
Diffstat (limited to 'net-fs/autofs/files')
| -rw-r--r-- | net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch b/net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch new file mode 100644 index 000000000000..e2a94bf82542 --- /dev/null +++ b/net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch @@ -0,0 +1,30 @@ +Avoid conflicts between sys/mount.h and linux/mount.h + +linux/fs.h includes linux/mount.h and this include file is unused so +do not include it and avoid conflict too with glibc 2.36+ see [1] + +[1] https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/modules/parse_amd.c ++++ b/modules/parse_amd.c +@@ -27,7 +27,6 @@ + #include <sys/utsname.h> + #include <netinet/in.h> + #include <sys/mount.h> +-#include <linux/fs.h> + + #define MODULE_PARSE + #include "automount.h" +--- a/modules/parse_sun.c ++++ b/modules/parse_sun.c +@@ -30,7 +30,6 @@ + #include <sys/utsname.h> + #include <netinet/in.h> + #include <sys/mount.h> +-#include <linux/fs.h> + + #define MODULE_PARSE + #include "automount.h" |