summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2016-04-15 22:26:00 -0400
committerMike Gilbert <floppym@gentoo.org>2016-04-15 22:26:17 -0400
commitc2e7986a5f0d6ecad9a3b5cb9c57d2e3f7849cb4 (patch)
tree2839104edc6bc930fff89d6f85431383ae4528bc /sys-libs/efivar
parentgames-engines/qtads: version bump (bug #580036) (diff)
downloadgentoo-c2e7986a5f0d6ecad9a3b5cb9c57d2e3f7849cb4.tar.gz
gentoo-c2e7986a5f0d6ecad9a3b5cb9c57d2e3f7849cb4.tar.bz2
gentoo-c2e7986a5f0d6ecad9a3b5cb9c57d2e3f7849cb4.zip
sys-libs/efivar: fix build with glibc-2.23
Bug: https://bugs.gentoo.org/580142 Package-Manager: portage-2.2.28_p64
Diffstat (limited to 'sys-libs/efivar')
-rw-r--r--sys-libs/efivar/efivar-0.23.ebuild1
-rw-r--r--sys-libs/efivar/files/0.23-sysmacros.patch29
2 files changed, 30 insertions, 0 deletions
diff --git a/sys-libs/efivar/efivar-0.23.ebuild b/sys-libs/efivar/efivar-0.23.ebuild
index 85de0552008..1c044ab26e2 100644
--- a/sys-libs/efivar/efivar-0.23.ebuild
+++ b/sys-libs/efivar/efivar-0.23.ebuild
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}
src_prepare() {
tc-ld-disable-gold
epatch "${FILESDIR}/0.21-nvme_ioctl.h.patch"
+ epatch "${FILESDIR}/0.23-sysmacros.patch"
epatch_user
}
diff --git a/sys-libs/efivar/files/0.23-sysmacros.patch b/sys-libs/efivar/files/0.23-sysmacros.patch
new file mode 100644
index 00000000000..526b8436c2d
--- /dev/null
+++ b/sys-libs/efivar/files/0.23-sysmacros.patch
@@ -0,0 +1,29 @@
+From 554b0255f9ee265f7d093ac875215207fac8fb1e Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Fri, 15 Apr 2016 17:58:15 -0400
+Subject: [PATCH] Include sys/sysmacros.h when sys/types.h does not define
+ major
+
+glibc is planning to drop this from sys/types.h.
+---
+ src/linux.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/linux.c b/src/linux.c
+index 866455d..fde6947 100644
+--- a/src/linux.c
++++ b/src/linux.c
+@@ -36,6 +36,10 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+
++#ifndef major
++#include <sys/sysmacros.h>
++#endif
++
+ #include <efivar.h>
+ #include <efiboot.h>
+
+--
+2.8.1
+