From c2e7986a5f0d6ecad9a3b5cb9c57d2e3f7849cb4 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Fri, 15 Apr 2016 22:26:00 -0400
Subject: [PATCH] sys-libs/efivar: fix build with glibc-2.23

Bug: https://bugs.gentoo.org/580142

Package-Manager: portage-2.2.28_p64
---
 sys-libs/efivar/efivar-0.23.ebuild         |  1 +
 sys-libs/efivar/files/0.23-sysmacros.patch | 29 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 sys-libs/efivar/files/0.23-sysmacros.patch

diff --git a/sys-libs/efivar/efivar-0.23.ebuild b/sys-libs/efivar/efivar-0.23.ebuild
index 85de055200834..1c044ab26e244 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 0000000000000..526b8436c2d3e
--- /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
+