Gentoo Archives: gentoo-commits

From: Aric Belsito <lluixhi@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: dev-libs/ell/files/, dev-libs/ell/
Date: Sat, 09 Jun 2018 17:16:43
Message-Id: 1528564558.0e89a395317ba399d7605542cf6deb98c55c2121.lluixhi@gentoo
1 commit: 0e89a395317ba399d7605542cf6deb98c55c2121
2 Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
3 AuthorDate: Sat Jun 9 17:15:58 2018 +0000
4 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
5 CommitDate: Sat Jun 9 17:15:58 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=0e89a395
7
8 dev-libs/ell: new package
9
10 dev-libs/ell/Manifest | 1 +
11 dev-libs/ell/ell-0.5.ebuild | 34 +++++++++++++++++++++++++++++
12 dev-libs/ell/files/ell-0.5-musl.patch | 40 +++++++++++++++++++++++++++++++++++
13 dev-libs/ell/metadata.xml | 11 ++++++++++
14 4 files changed, 86 insertions(+)
15
16 diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
17 new file mode 100644
18 index 0000000..badfe29
19 --- /dev/null
20 +++ b/dev-libs/ell/Manifest
21 @@ -0,0 +1 @@
22 +DIST ell-0.5.tar.xz 393112 BLAKE2B c9b718a6b471ef428f563989843281b7b00c1ed382d68e241d9b1f624ef085c554ed46eefac544a8711fe2ec15428eb5b069f60d827e5a363e8c0a539e2fbf7f SHA512 aa84ce99980ada2bd80ac5a479d31c84784bc7b09afd0586ab1672a1227dbe14fdbc3788ccc812b22073e1e55b8902f81f86d9f1350c5c280886a8528d6979ce
23
24 diff --git a/dev-libs/ell/ell-0.5.ebuild b/dev-libs/ell/ell-0.5.ebuild
25 new file mode 100644
26 index 0000000..bfc5c90
27 --- /dev/null
28 +++ b/dev-libs/ell/ell-0.5.ebuild
29 @@ -0,0 +1,34 @@
30 +# Copyright 1999-2018 Gentoo Foundation
31 +# Distributed under the terms of the GNU General Public License v2
32 +
33 +EAPI=7
34 +
35 +inherit multilib-minimal
36 +
37 +DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
38 +HOMEPAGE="https://01.org/ell"
39 +SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
40 +LICENSE="LGPL-2.1"
41 +SLOT="0"
42 +
43 +KEYWORDS="~amd64 ~x86"
44 +IUSE="glib pie"
45 +
46 +RDEPEND="
47 + glib? ( dev-libs/glib:2 )
48 +"
49 +DEPEND="${RDEPEND}"
50 +
51 +PATCHES=( "${FILESDIR}"/${P}-musl.patch )
52 +
53 +multilib_src_configure() {
54 + local myeconfargs=(
55 + $(use_enable glib)
56 + $(use_enable pie)
57 + )
58 + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
59 +}
60 +
61 +multilib_src_install_all() {
62 + find "${ED}" -name "*.la" -delete || die
63 +}
64
65 diff --git a/dev-libs/ell/files/ell-0.5-musl.patch b/dev-libs/ell/files/ell-0.5-musl.patch
66 new file mode 100644
67 index 0000000..ebdf03f
68 --- /dev/null
69 +++ b/dev-libs/ell/files/ell-0.5-musl.patch
70 @@ -0,0 +1,40 @@
71 +diff -Naur ell-0.5.orig/ell/dhcp-transport.c ell-0.5/ell/dhcp-transport.c
72 +--- ell-0.5.orig/ell/dhcp-transport.c 2018-06-09 10:07:51.462972199 -0700
73 ++++ ell-0.5/ell/dhcp-transport.c 2018-06-09 10:14:26.560965123 -0700
74 +@@ -183,12 +183,12 @@
75 + ip->saddr = L_CPU_TO_BE32(saddr);
76 + ip->daddr = L_CPU_TO_BE32(daddr);
77 +
78 +- udp->source = L_CPU_TO_BE16(sport);
79 +- udp->dest = L_CPU_TO_BE16(dport);
80 ++ udp->uh_sport = L_CPU_TO_BE16(sport);
81 ++ udp->uh_dport = L_CPU_TO_BE16(dport);
82 +
83 +- udp->len = L_CPU_TO_BE16(len + sizeof(*udp));
84 ++ udp->uh_ulen = L_CPU_TO_BE16(len + sizeof(*udp));
85 +
86 +- ip->check = udp->len;
87 ++ ip->check = udp->uh_ulen;
88 +
89 + iov[0].iov_base = &ip->ttl;
90 + iov[0].iov_len = sizeof(*ip) - 8;
91 +@@ -196,7 +196,7 @@
92 + iov[1].iov_len = sizeof(*udp);
93 + iov[2].iov_base = (void *) data;
94 + iov[2].iov_len = len;
95 +- udp->check = _dhcp_checksumv(iov, 3);
96 ++ udp->uh_sum = _dhcp_checksumv(iov, 3);
97 +
98 + ip->ttl = IPDEFTTL;
99 + ip->check = 0;
100 +diff -Naur ell-0.5.orig/ell/dhcp.c ell-0.5/ell/dhcp.c
101 +--- ell-0.5.orig/ell/dhcp.c 2018-06-09 10:07:51.465972199 -0700
102 ++++ ell-0.5/ell/dhcp.c 2018-06-09 10:08:35.899971403 -0700
103 +@@ -26,7 +26,6 @@
104 +
105 + #include <netinet/ip.h>
106 + #include <linux/types.h>
107 +-#include <linux/if_arp.h>
108 + #include <net/ethernet.h>
109 + #include <errno.h>
110 + #include <time.h>
111
112 diff --git a/dev-libs/ell/metadata.xml b/dev-libs/ell/metadata.xml
113 new file mode 100644
114 index 0000000..75355ca
115 --- /dev/null
116 +++ b/dev-libs/ell/metadata.xml
117 @@ -0,0 +1,11 @@
118 +<?xml version="1.0" encoding="UTF-8"?>
119 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
120 +<pkgmetadata>
121 + <maintainer type="person">
122 + <email>polynomial-c@g.o</email>
123 + <name>Lars Wendler</name>
124 + </maintainer>
125 + <use>
126 + <flag name="glib">Enable dev-libs/glib support</flag>
127 + </use>
128 +</pkgmetadata>