diff options
| author |   Sam James <sam@gentoo.org> | 2022-08-05 01:59:31 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-08-05 01:59:31 +0100 |
| commit | 25b2c005b4d330755c20628113ea850f447e785e (patch) | |
| tree | b09b7027e9249c5667dbaf8b51e26c2d3692ba7c /sys-apps/hdparm | |
| parent | www-client/opera-beta: remove old (diff) | |
| download | gentoo-25b2c005b4d330755c20628113ea850f447e785e.tar.gz gentoo-25b2c005b4d330755c20628113ea850f447e785e.tar.bz2 gentoo-25b2c005b4d330755c20628113ea850f447e785e.zip | |
sys-apps/hdparm: fix build w/ glibc 2.36
Closes: https://bugs.gentoo.org/863671
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-apps/hdparm')
| -rw-r--r-- | sys-apps/hdparm/files/hdparm-9.64-glibc-2.36.patch | 27 | ||||
| -rw-r--r-- | sys-apps/hdparm/hdparm-9.64.ebuild | 1 |
2 files changed, 28 insertions, 0 deletions
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 new file mode 100644 index 000000000000..c235b0f3941c --- /dev/null +++ b/sys-apps/hdparm/files/hdparm-9.64-glibc-2.36.patch @@ -0,0 +1,27 @@ +https://bugs.gentoo.org/863671 +https://sourceforge.net/p/hdparm/patches/52/ + +From c8fc52968f9e97d29ccf6deb348ec02627d74235 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 29 Jul 2022 13:00:40 -0700 +Subject: [PATCH] hdparm: Remove unused linux/fs.h header + +this helps fixing builds with glibc 2.36 where mount.h conflits now with +kernel mount.h which is included indirectly by linux/fs.h see [1] for +details + +[1] https://sourceware.org/glibc/wiki/Release/2.36 + +Upstream-Status: Submitted [] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/hdparm.c ++++ b/hdparm.c +@@ -25,7 +25,6 @@ + #include <sys/mman.h> + #include <sys/user.h> + #include <linux/types.h> +-#include <linux/fs.h> + #include <linux/major.h> + #include <endian.h> + #include <asm/byteorder.h> + diff --git a/sys-apps/hdparm/hdparm-9.64.ebuild b/sys-apps/hdparm/hdparm-9.64.ebuild index 16d39cbe5836..066375abdd74 100644 --- a/sys-apps/hdparm/hdparm-9.64.ebuild +++ b/sys-apps/hdparm/hdparm-9.64.ebuild @@ -17,6 +17,7 @@ IUSE="static" PATCHES=( "${FILESDIR}"/${PN}-9.60-build.patch + "${FILESDIR}"/${PN}-9.64-glibc-2.36.patch ) src_prepare() { |