Skip to content

Commit

Permalink
sys-libs/efivar: fix build with glibc-2.23
Browse files Browse the repository at this point in the history
Bug: https://bugs.gentoo.org/580142

Package-Manager: portage-2.2.28_p64
  • Loading branch information
floppym committed Apr 16, 2016
1 parent adeed39 commit c2e7986
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
1 change: 1 addition & 0 deletions sys-libs/efivar/efivar-0.23.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
29 changes: 29 additions & 0 deletions sys-libs/efivar/files/0.23-sysmacros.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From 554b0255f9ee265f7d093ac875215207fac8fb1e Mon Sep 17 00:00:00 2001
From: Mike Gilbert <[email protected]>
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

0 comments on commit c2e7986

Please sign in to comment.