sys-auth/elogind: Backport sysmacros.h fix from systemd

Gentoo-bug: 613422

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/sys-auth/elogind/elogind-226.4.ebuild b/sys-auth/elogind/elogind-226.4.ebuild
index 7b284e007ac8aa65de4669978c33daea329f700b..2570aaccad3b50a95a21e1a27221831334075231 100644 (file)
--- a/sys-auth/elogind/elogind-226.4.ebuild
+++ b/sys-auth/elogind/elogind-226.4.ebuild
@@ -37,7 +37,10 @@ DEPEND="${COMMON_DEPEND}
 "
 PDEPEND="policykit? ( sys-auth/polkit )"
 
-PATCHES=( "${FILESDIR}/${P}-docs.patch" )
+PATCHES=(
+       "${FILESDIR}/${P}-docs.patch"
+       "${FILESDIR}/${P}-glibc.patch"
+)
 
 pkg_setup() {
        local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SECURITY_SMACK

diff --git a/sys-auth/elogind/files/elogind-226.4-glibc.patch b/sys-auth/elogind/files/elogind-226.4-glibc.patch
new file mode 100644 (file)
index 0000000..7b8a57d
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-226.4-glibc.patch
@@ -0,0 +1,34 @@
+commit 27d13af71c3af6b2f9b60556d2c046dbb6e36e23
+Author: Mike Frysinger <vapier@gentoo.org>
+Date:   Mon Mar 14 17:44:49 2016 -0400
+
+    include sys/sysmacros.h in more places
+    
+    Since glibc is moving away from implicitly including sys/sysmacros.h
+    all the time via sys/types.h, include the header directly in more
+    places.  This seems to cover most makedev/major/minor usage.
+
+diff --git a/src/basic/macro.h b/src/basic/macro.h
+index c34441d75..b36a95675 100644
+--- a/src/basic/macro.h
++++ b/src/basic/macro.h
+@@ -23,6 +23,7 @@
+ #include <inttypes.h>
+ #include <stdbool.h>
+ #include <sys/param.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ 
+ #define _printf_(a,b) __attribute__ ((format (printf, a, b)))
+diff --git a/src/basic/util.h b/src/basic/util.h
+index e095254b5..286db0515 100644
+--- a/src/basic/util.h
++++ b/src/basic/util.h
+@@ -36,6 +36,7 @@
+ #include <mntent.h>
+ #include <sys/inotify.h>
+ #include <sys/statfs.h>
++#include <sys/sysmacros.h>
+ 
+ #include "macro.h"
+ #include "missing.h"