summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Väth <martin@mvath.de>2018-09-11 07:32:49 +0200
committerMartin Väth <martin@mvath.de>2018-09-11 07:32:49 +0200
commit9efdea37fbfa020b9ce98afd8f10847017dd7aa0 (patch)
tree2eaafd9c7213b72b541597379ed1cdc8aefa437c /sys-block
parentwww-plugins: Version bumps (diff)
downloadmv-9efdea37fbfa020b9ce98afd8f10847017dd7aa0.tar.gz
mv-9efdea37fbfa020b9ce98afd8f10847017dd7aa0.tar.bz2
mv-9efdea37fbfa020b9ce98afd8f10847017dd7aa0.zip
sys-block/parted: fix for >=sys-libs/glibc-2.26
Diffstat (limited to 'sys-block')
-rw-r--r--sys-block/parted/files/parted-3.2-sysmacros.patch28
-rw-r--r--sys-block/parted/parted-2.4-r3.ebuild (renamed from sys-block/parted/parted-2.4-r2.ebuild)1
2 files changed, 29 insertions, 0 deletions
diff --git a/sys-block/parted/files/parted-3.2-sysmacros.patch b/sys-block/parted/files/parted-3.2-sysmacros.patch
new file mode 100644
index 00000000..a29e7619
--- /dev/null
+++ b/sys-block/parted/files/parted-3.2-sysmacros.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/580022
+
+From dec8995fe80508374beba6356f6ecbba8ef6b18b Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 21 Jun 2016 15:01:08 -0400
+Subject: [PATCH] include sysmacros.h for major/minor/makedev
+
+Linux C libs are moving away from including this header implicitly via
+sys/types.h, so include it explicitly.
+---
+ libparted/arch/linux.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
+index 326b95619d31..e5c168be3c68 100644
+--- a/libparted/arch/linux.c
++++ b/libparted/arch/linux.c
+@@ -37,6 +37,7 @@
+ #include <dirent.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/utsname.h> /* for uname() */
+ #include <scsi/scsi.h>
+--
+2.8.2
+
diff --git a/sys-block/parted/parted-2.4-r2.ebuild b/sys-block/parted/parted-2.4-r3.ebuild
index 1e912c7b..05432868 100644
--- a/sys-block/parted/parted-2.4-r2.ebuild
+++ b/sys-block/parted/parted-2.4-r3.ebuild
@@ -33,6 +33,7 @@ BDEPEND="nls? ( >=sys-devel/gettext-0.12.1-r2 )"
PATCHES=(
"${FILESDIR}"/${P}-no-gets.patch
"${FILESDIR}"/${P}-readline.patch
+ "${FILESDIR}"/${PN}-3.2-sysmacros.patch
)
DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )