| 1 |
commit: 06e46cbf23e90f14b9086ea2d7b442b3ea41aecc |
| 2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Jun 26 21:30:41 2018 +0000 |
| 4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Jun 26 21:30:41 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=06e46cbf |
| 7 |
|
| 8 |
dev-libs/ell: version bump to 0.6 |
| 9 |
|
| 10 |
dev-libs/ell/Manifest | 1 + |
| 11 |
dev-libs/ell/ell-0.6.ebuild | 34 +++++++++++++++++++++++++++++ |
| 12 |
dev-libs/ell/files/ell-0.6-musl.patch | 40 +++++++++++++++++++++++++++++++++++ |
| 13 |
dev-libs/ell/metadata.xml | 2 +- |
| 14 |
4 files changed, 76 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest |
| 17 |
index badfe29..9ac1820 100644 |
| 18 |
--- a/dev-libs/ell/Manifest |
| 19 |
+++ b/dev-libs/ell/Manifest |
| 20 |
@@ -1 +1,2 @@ |
| 21 |
DIST ell-0.5.tar.xz 393112 BLAKE2B c9b718a6b471ef428f563989843281b7b00c1ed382d68e241d9b1f624ef085c554ed46eefac544a8711fe2ec15428eb5b069f60d827e5a363e8c0a539e2fbf7f SHA512 aa84ce99980ada2bd80ac5a479d31c84784bc7b09afd0586ab1672a1227dbe14fdbc3788ccc812b22073e1e55b8902f81f86d9f1350c5c280886a8528d6979ce |
| 22 |
+DIST ell-0.6.tar.xz 393016 BLAKE2B ad3a5402eca26a77caabb1d01054500333824c56403c1585c7aaf9ac19fd3f17e4d1dfc226f58ae1303d678e88d5b07c6b6e9c68a643f99b645ca4c4a10f7b19 SHA512 df39c460e781d5fa9838df362721687747148280cb7762dddce6aa35c38db1713b01efff5156d9dc144d6e11d50be7058db1362f4143f7a606bc6fbeeedaf8bf |
| 23 |
|
| 24 |
diff --git a/dev-libs/ell/ell-0.6.ebuild b/dev-libs/ell/ell-0.6.ebuild |
| 25 |
new file mode 100644 |
| 26 |
index 0000000..bfc5c90 |
| 27 |
--- /dev/null |
| 28 |
+++ b/dev-libs/ell/ell-0.6.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.6-musl.patch b/dev-libs/ell/files/ell-0.6-musl.patch |
| 66 |
new file mode 100644 |
| 67 |
index 0000000..c1a1673 |
| 68 |
--- /dev/null |
| 69 |
+++ b/dev-libs/ell/files/ell-0.6-musl.patch |
| 70 |
@@ -0,0 +1,40 @@ |
| 71 |
+diff -Naur ell-0.6.orig/ell/dhcp-transport.c ell-0.6/ell/dhcp-transport.c |
| 72 |
+--- ell-0.6.orig/ell/dhcp-transport.c 2018-06-26 14:29:02.357862603 -0700 |
| 73 |
++++ ell-0.6/ell/dhcp-transport.c 2018-06-26 14:29:09.657862472 -0700 |
| 74 |
+@@ -184,12 +184,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 |
+@@ -197,7 +197,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.6.orig/ell/dhcp.c ell-0.6/ell/dhcp.c |
| 101 |
+--- ell-0.6.orig/ell/dhcp.c 2018-06-26 14:29:02.360862602 -0700 |
| 102 |
++++ ell-0.6/ell/dhcp.c 2018-06-26 14:29:15.918862360 -0700 |
| 103 |
+@@ -27,7 +27,6 @@ |
| 104 |
+ #include <netinet/ip.h> |
| 105 |
+ #include <net/ethernet.h> |
| 106 |
+ #include <linux/types.h> |
| 107 |
+-#include <linux/if_arp.h> |
| 108 |
+ #include <errno.h> |
| 109 |
+ #include <time.h> |
| 110 |
+ |
| 111 |
|
| 112 |
diff --git a/dev-libs/ell/metadata.xml b/dev-libs/ell/metadata.xml |
| 113 |
index 75355ca..01db0cd 100644 |
| 114 |
--- a/dev-libs/ell/metadata.xml |
| 115 |
+++ b/dev-libs/ell/metadata.xml |
| 116 |
@@ -6,6 +6,6 @@ |
| 117 |
<name>Lars Wendler</name> |
| 118 |
</maintainer> |
| 119 |
<use> |
| 120 |
- <flag name="glib">Enable dev-libs/glib support</flag> |
| 121 |
+ <flag name="glib">Enable <pkg>dev-libs/glib</pkg> support</flag> |
| 122 |
</use> |
| 123 |
</pkgmetadata> |
Archives