Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/etherdfs/, net-misc/etherdfs/files/
Date: Thu, 27 Aug 2020 18:20:36
Message-Id: 1598552312.a0aacafb66737245439ac8a2fa2d96b4b873f18f.conikost@gentoo
1 commit: a0aacafb66737245439ac8a2fa2d96b4b873f18f
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 27 18:18:18 2020 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 27 18:18:32 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0aacafb
7
8 net-misc/etherdfs: fix compilation with musl
9
10 Closes: https://bugs.gentoo.org/715454
11 Package-Manager: Portage-3.0.4, Repoman-3.0.1
12 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
13
14 net-misc/etherdfs/etherdfs-20180203-r1.ebuild | 5 ++++-
15 net-misc/etherdfs/files/etherdfs-20180203-musl.patch | 10 ++++++++++
16 2 files changed, 14 insertions(+), 1 deletion(-)
17
18 diff --git a/net-misc/etherdfs/etherdfs-20180203-r1.ebuild b/net-misc/etherdfs/etherdfs-20180203-r1.ebuild
19 index 91c6282c51a..0245ab3d16a 100644
20 --- a/net-misc/etherdfs/etherdfs-20180203-r1.ebuild
21 +++ b/net-misc/etherdfs/etherdfs-20180203-r1.ebuild
22 @@ -25,7 +25,10 @@ BDEPEND="tsr? ( app-arch/unzip )"
23
24 S="${WORKDIR}/${MY_P}"
25
26 -PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
27 +PATCHES=(
28 + "${FILESDIR}/${P}-makefile.patch"
29 + "${FILESDIR}/${P}-musl.patch"
30 +)
31
32 DOCS=( "ethersrv-linux.txt" "history.txt" )
33
34
35 diff --git a/net-misc/etherdfs/files/etherdfs-20180203-musl.patch b/net-misc/etherdfs/files/etherdfs-20180203-musl.patch
36 new file mode 100644
37 index 00000000000..b0fdb532f20
38 --- /dev/null
39 +++ b/net-misc/etherdfs/files/etherdfs-20180203-musl.patch
40 @@ -0,0 +1,10 @@
41 +--- a/ethersrv-linux.c
42 ++++ b/ethersrv-linux.c
43 +@@ -31,7 +31,6 @@
44 + #include <arpa/inet.h> /* htons() */
45 + #include <errno.h>
46 + #include <endian.h> /* le16toh(), le32toh() */
47 +-#include <linux/if_ether.h>
48 + #include <linux/if_packet.h>
49 + #include <limits.h> /* PATH_MAX and such */
50 + #include <net/ethernet.h>