summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-04-18 18:28:39 -0400
committerMike Frysinger <vapier@gentoo.org>2016-04-18 18:28:39 -0400
commitf6c908161b81c85a09636d2a7d0b5e7dec1727dd (patch)
treeccf73dcbe976f01bb551eab3f9512cc572d27b3f /sys-apps/usbmon
parentsys-fs/f2fs-tools: fix build w/newer glibc #580338 (diff)
downloadgentoo-f6c908161b81c85a09636d2a7d0b5e7dec1727dd.tar.gz
gentoo-f6c908161b81c85a09636d2a7d0b5e7dec1727dd.tar.bz2
gentoo-f6c908161b81c85a09636d2a7d0b5e7dec1727dd.zip
sys-apps/usbmon: fix build w/newer glibc #580360
Diffstat (limited to 'sys-apps/usbmon')
-rw-r--r--sys-apps/usbmon/files/usbmon-6-sysmacros.patch38
-rw-r--r--sys-apps/usbmon/usbmon-6-r1.ebuild3
2 files changed, 40 insertions, 1 deletions
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 00000000000..109b4745dc0
--- /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 6c18e603a8d..db024adae2c 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' \