| Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 1 | From 7b0e7ba674321ec1ddd6b9cbb419e5fb44f88bb3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Robbie Harwood <rharwood@redhat.com> |
| 3 | Date: Thu, 28 Jul 2022 16:11:24 -0400 |
| 4 | Subject: [PATCH] Fix glibc 2.36 build (mount.h conflicts) |
| 5 | |
| 6 | glibc has decided that sys/mount.h and linux/mount.h are no longer |
| 7 | usable at the same time. This broke the build, since linux/fs.h itself |
| 8 | includes linux/mount.h. For now, fix the build by only including |
| 9 | sys/mount.h where we need it. |
| 10 | |
| 11 | See-also: https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E |
| 12 | Resolves: #227 |
| 13 | |
| 14 | Upstream-Status: Backport [https://github.com/rhboot/efivar/commit/bc65d63ebf8fe6ac8a099ff15ca200986dba1565] |
| 15 | Signed-off-by: Robbie Harwood <rharwood@redhat.com> |
| 16 | --- |
| 17 | src/gpt.c | 1 + |
| 18 | src/linux.c | 1 + |
| 19 | src/util.h | 1 - |
| 20 | 3 files changed, 2 insertions(+), 1 deletion(-) |
| 21 | |
| 22 | diff --git a/src/gpt.c b/src/gpt.c |
| 23 | index 1eda049..21413c3 100644 |
| 24 | --- a/src/gpt.c |
| 25 | +++ b/src/gpt.c |
| 26 | @@ -17,6 +17,7 @@ |
| 27 | #include <stdio.h> |
| 28 | #include <stdlib.h> |
| 29 | #include <string.h> |
| 30 | +#include <sys/mount.h> |
| 31 | #include <sys/param.h> |
| 32 | #include <sys/stat.h> |
| 33 | #include <sys/utsname.h> |
| 34 | diff --git a/src/linux.c b/src/linux.c |
| 35 | index 47e45ae..1780816 100644 |
| 36 | --- a/src/linux.c |
| 37 | +++ b/src/linux.c |
| 38 | @@ -20,6 +20,7 @@ |
| 39 | #include <stdbool.h> |
| 40 | #include <stdio.h> |
| 41 | #include <sys/ioctl.h> |
| 42 | +#include <sys/mount.h> |
| 43 | #include <sys/socket.h> |
| 44 | #include <sys/sysmacros.h> |
| 45 | #include <sys/types.h> |
| 46 | diff --git a/src/util.h b/src/util.h |
| 47 | index 3300666..1e67e44 100644 |
| 48 | --- a/src/util.h |
| 49 | +++ b/src/util.h |
| 50 | @@ -23,7 +23,6 @@ |
| 51 | #include <stdio.h> |
| 52 | #include <string.h> |
| 53 | #include <sys/ioctl.h> |
| 54 | -#include <sys/mount.h> |
| 55 | #include <sys/stat.h> |
| 56 | #include <sys/types.h> |
| 57 | #include <tgmath.h> |
| 58 | -- |
| 59 | 2.37.1 |
| 60 | |