| 1 |
commit: 25b2c005b4d330755c20628113ea850f447e785e |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 5 00:59:31 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 5 00:59:31 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25b2c005 |
| 7 |
|
| 8 |
sys-apps/hdparm: fix build w/ glibc 2.36 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/863671 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-apps/hdparm/files/hdparm-9.64-glibc-2.36.patch | 27 ++++++++++++++++++++++ |
| 14 |
sys-apps/hdparm/hdparm-9.64.ebuild | 1 + |
| 15 |
2 files changed, 28 insertions(+) |
| 16 |
|
| 17 |
diff --git a/sys-apps/hdparm/files/hdparm-9.64-glibc-2.36.patch b/sys-apps/hdparm/files/hdparm-9.64-glibc-2.36.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..c235b0f3941c |
| 20 |
--- /dev/null |
| 21 |
+++ b/sys-apps/hdparm/files/hdparm-9.64-glibc-2.36.patch |
| 22 |
@@ -0,0 +1,27 @@ |
| 23 |
+https://bugs.gentoo.org/863671 |
| 24 |
+https://sourceforge.net/p/hdparm/patches/52/ |
| 25 |
+ |
| 26 |
+From c8fc52968f9e97d29ccf6deb348ec02627d74235 Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Khem Raj <raj.khem@×××××.com> |
| 28 |
+Date: Fri, 29 Jul 2022 13:00:40 -0700 |
| 29 |
+Subject: [PATCH] hdparm: Remove unused linux/fs.h header |
| 30 |
+ |
| 31 |
+this helps fixing builds with glibc 2.36 where mount.h conflits now with |
| 32 |
+kernel mount.h which is included indirectly by linux/fs.h see [1] for |
| 33 |
+details |
| 34 |
+ |
| 35 |
+[1] https://sourceware.org/glibc/wiki/Release/2.36 |
| 36 |
+ |
| 37 |
+Upstream-Status: Submitted [] |
| 38 |
+Signed-off-by: Khem Raj <raj.khem@×××××.com> |
| 39 |
+--- a/hdparm.c |
| 40 |
++++ b/hdparm.c |
| 41 |
+@@ -25,7 +25,6 @@ |
| 42 |
+ #include <sys/mman.h> |
| 43 |
+ #include <sys/user.h> |
| 44 |
+ #include <linux/types.h> |
| 45 |
+-#include <linux/fs.h> |
| 46 |
+ #include <linux/major.h> |
| 47 |
+ #include <endian.h> |
| 48 |
+ #include <asm/byteorder.h> |
| 49 |
+ |
| 50 |
|
| 51 |
diff --git a/sys-apps/hdparm/hdparm-9.64.ebuild b/sys-apps/hdparm/hdparm-9.64.ebuild |
| 52 |
index 16d39cbe5836..066375abdd74 100644 |
| 53 |
--- a/sys-apps/hdparm/hdparm-9.64.ebuild |
| 54 |
+++ b/sys-apps/hdparm/hdparm-9.64.ebuild |
| 55 |
@@ -17,6 +17,7 @@ IUSE="static" |
| 56 |
|
| 57 |
PATCHES=( |
| 58 |
"${FILESDIR}"/${PN}-9.60-build.patch |
| 59 |
+ "${FILESDIR}"/${PN}-9.64-glibc-2.36.patch |
| 60 |
) |
| 61 |
|
| 62 |
src_prepare() { |
Archives