Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/usermode-utilities/files/, sys-apps/usermode-utilities/
Date: Sun, 27 Nov 2016 23:56:37
Message-Id: 1480290964.5a7c2b8a0244b71e7f74deb45c78fdb69e6305e3.vapier@gentoo
1 commit: 5a7c2b8a0244b71e7f74deb45c78fdb69e6305e3
2 Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
3 AuthorDate: Sun Nov 27 23:56:04 2016 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 27 23:56:04 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a7c2b8a
7
8 sys-apps/usermode-utilities: fix build w/newer glibc #580816
9
10 .../usermode-utilities-20070815-headers.patch | 27 ++++++++++++++++++++++
11 .../usermode-utilities-20070815-r3.ebuild | 2 ++
12 2 files changed, 29 insertions(+)
13
14 diff --git a/sys-apps/usermode-utilities/files/usermode-utilities-20070815-headers.patch b/sys-apps/usermode-utilities/files/usermode-utilities-20070815-headers.patch
15 new file mode 100644
16 index 00000000..13fd556
17 --- /dev/null
18 +++ b/sys-apps/usermode-utilities/files/usermode-utilities-20070815-headers.patch
19 @@ -0,0 +1,27 @@
20 +https://bugs.gentoo.org/580816
21 +
22 +include headers needed by targets
23 +
24 +--- b/tools-20070815/uml_net/ethertap.c
25 ++++ a/tools-20070815/uml_net/ethertap.c
26 +@@ -13,6 +13,7 @@
27 + #include <sys/stat.h>
28 + #include <sys/ioctl.h>
29 + #include <net/if.h>
30 ++#include <sys/select.h>
31 + #include "host.h"
32 + #include "output.h"
33 +
34 +
35 +for major/minor macros
36 +
37 +--- b/tools-20070815/uml_net/host.c
38 ++++ a/tools-20070815/uml_net/host.c
39 +@@ -10,6 +10,7 @@
40 + #include <ctype.h>
41 + #include <sys/wait.h>
42 + #include <sys/stat.h>
43 ++#include <sys/sysmacros.h>
44 + #include "output.h"
45 + #include "host.h"
46 +
47
48 diff --git a/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild
49 index b6ae228..5544e69 100644
50 --- a/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild
51 +++ b/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild
52 @@ -26,6 +26,8 @@ src_prepare() {
53 epatch "${FILESDIR}"/${P}-rollup.patch
54 # Fix owner of humfsify; bug #364531
55 epatch "${FILESDIR}"/${P}-humfsify-owner.patch
56 + epatch "${FILESDIR}"/${P}-headers.patch #580816
57 +
58 sed -i -e 's:-o \$(BIN):$(LDFLAGS) -o $(BIN):' "${S}"/*/Makefile || die "LDFLAGS sed failed"
59 sed -i -e 's:-o \$@:$(LDFLAGS) -o $@:' "${S}"/moo/Makefile || die "LDFLAGS sed (moo) failed"
60 if ! use fuse; then