[gentoo-commits] repo/gentoo:master commit in: sys-apps/usbmon/, sys-apps/usbmon/files/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/usbmon/, sys-apps/usbmon/files/

[Mike Frysinger]

commit:     f6c908161b81c85a09636d2a7d0b5e7dec1727dd
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 22:28:39 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 22:28:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6c90816

sys-apps/usbmon: fix build w/newer glibc #580360

 sys-apps/usbmon/files/usbmon-6-sysmacros.patch | 38 ++++++++++++++++++++++++++
 sys-apps/usbmon/usbmon-6-r1.ebuild             |  3 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/sys-apps/usbmon/files/usbmon-6-sysmacros.patch b/sys-apps/usbmon/files/usbmon-6-sysmacros.patch
new file mode 100644
index 0000000..109b474
--- /dev/null
+++ b/sys-apps/usbmon/files/usbmon-6-sysmacros.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/580360
+
+From 449f591d0220e57face02898a9ae2617baace814 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 18 Apr 2016 18:24:49 -0400
+Subject: [PATCH] usbmon: include sys/sysmacros.h for makedev func
+
+Since glibc has always placed these funcs in sys/sysmacros.h, and other
+C libs require this, include it directly.  Otherwise we fail to build:
+usbmon.c: In function 'make_device':
+usbmon.c:966:8: warning: implicit declaration of function 'makedev' [-Wimplicit-function-declaration]
+  dev = makedev(major, p->ifnum);
+        ^
+usbmon.c:966:2: warning: nested extern declaration of 'makedev' [-Wnested-externs]
+  dev = makedev(major, p->ifnum);
+  ^
+...
+usbmon.o: In function 'make_device':
+usbmon.c:966: undefined reference to 'makedev'
+---
+ usbmon.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/usbmon.c b/usbmon.c
+index 37929f2..8d2acfc 100644
+--- a/usbmon.c
++++ b/usbmon.c
+@@ -32,6 +32,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+ #include <sys/mman.h>
++#include <sys/sysmacros.h>
+ #include <inttypes.h>
+ #include <stdarg.h>
+ 
+-- 
+2.7.4
+

diff --git a/sys-apps/usbmon/usbmon-6-r1.ebuild b/sys-apps/usbmon/usbmon-6-r1.ebuild
index 6c18e60..db024ada 100644
--- a/sys-apps/usbmon/usbmon-6-r1.ebuild
+++ b/sys-apps/usbmon/usbmon-6-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 DESCRIPTION="Userland for USB monitoring framework"
 HOMEPAGE="https://people.redhat.com/zaitcev/linux/"
@@ -18,6 +18,7 @@ IUSE=""
 DEPEND="!=sys-apps/usbutils-0.72-r2"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-sysmacros.patch #580360
 	sed \
 		-e '/CFLAGS =/s, = , \+= ,g' \
 		-e 's:-O2::g' \