commit: b00877198bbbc0b907ed572713b19ad1c3a98eba Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Sat Dec 29 18:18:27 2018 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Sat Dec 29 18:18:27 2018 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=b0087719
dev-libs/ell: in tree version works Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> dev-libs/ell/Manifest | 2 -- dev-libs/ell/ell-0.5.ebuild | 34 ----------------------------- dev-libs/ell/ell-0.6.ebuild | 34 ----------------------------- dev-libs/ell/files/ell-0.5-musl.patch | 40 ----------------------------------- dev-libs/ell/files/ell-0.6-musl.patch | 40 ----------------------------------- dev-libs/ell/metadata.xml | 11 ---------- 6 files changed, 161 deletions(-) diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest deleted file mode 100644 index 9ac1820..0000000 --- a/dev-libs/ell/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ell-0.5.tar.xz 393112 BLAKE2B c9b718a6b471ef428f563989843281b7b00c1ed382d68e241d9b1f624ef085c554ed46eefac544a8711fe2ec15428eb5b069f60d827e5a363e8c0a539e2fbf7f SHA512 aa84ce99980ada2bd80ac5a479d31c84784bc7b09afd0586ab1672a1227dbe14fdbc3788ccc812b22073e1e55b8902f81f86d9f1350c5c280886a8528d6979ce -DIST ell-0.6.tar.xz 393016 BLAKE2B ad3a5402eca26a77caabb1d01054500333824c56403c1585c7aaf9ac19fd3f17e4d1dfc226f58ae1303d678e88d5b07c6b6e9c68a643f99b645ca4c4a10f7b19 SHA512 df39c460e781d5fa9838df362721687747148280cb7762dddce6aa35c38db1713b01efff5156d9dc144d6e11d50be7058db1362f4143f7a606bc6fbeeedaf8bf diff --git a/dev-libs/ell/ell-0.5.ebuild b/dev-libs/ell/ell-0.5.ebuild deleted file mode 100644 index bfc5c90..0000000 --- a/dev-libs/ell/ell-0.5.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons" -HOMEPAGE="https://01.org/ell"; -SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"; -LICENSE="LGPL-2.1" -SLOT="0" - -KEYWORDS="~amd64 ~x86" -IUSE="glib pie" - -RDEPEND=" - glib? ( dev-libs/glib:2 ) -" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-musl.patch ) - -multilib_src_configure() { - local myeconfargs=( - $(use_enable glib) - $(use_enable pie) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - find "${ED}" -name "*.la" -delete || die -} diff --git a/dev-libs/ell/ell-0.6.ebuild b/dev-libs/ell/ell-0.6.ebuild deleted file mode 100644 index bfc5c90..0000000 --- a/dev-libs/ell/ell-0.6.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons" -HOMEPAGE="https://01.org/ell"; -SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"; -LICENSE="LGPL-2.1" -SLOT="0" - -KEYWORDS="~amd64 ~x86" -IUSE="glib pie" - -RDEPEND=" - glib? ( dev-libs/glib:2 ) -" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-musl.patch ) - -multilib_src_configure() { - local myeconfargs=( - $(use_enable glib) - $(use_enable pie) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - find "${ED}" -name "*.la" -delete || die -} diff --git a/dev-libs/ell/files/ell-0.5-musl.patch b/dev-libs/ell/files/ell-0.5-musl.patch deleted file mode 100644 index ebdf03f..0000000 --- a/dev-libs/ell/files/ell-0.5-musl.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Naur ell-0.5.orig/ell/dhcp-transport.c ell-0.5/ell/dhcp-transport.c ---- ell-0.5.orig/ell/dhcp-transport.c 2018-06-09 10:07:51.462972199 -0700 -+++ ell-0.5/ell/dhcp-transport.c 2018-06-09 10:14:26.560965123 -0700 -@@ -183,12 +183,12 @@ - ip->saddr = L_CPU_TO_BE32(saddr); - ip->daddr = L_CPU_TO_BE32(daddr); - -- udp->source = L_CPU_TO_BE16(sport); -- udp->dest = L_CPU_TO_BE16(dport); -+ udp->uh_sport = L_CPU_TO_BE16(sport); -+ udp->uh_dport = L_CPU_TO_BE16(dport); - -- udp->len = L_CPU_TO_BE16(len + sizeof(*udp)); -+ udp->uh_ulen = L_CPU_TO_BE16(len + sizeof(*udp)); - -- ip->check = udp->len; -+ ip->check = udp->uh_ulen; - - iov[0].iov_base = &ip->ttl; - iov[0].iov_len = sizeof(*ip) - 8; -@@ -196,7 +196,7 @@ - iov[1].iov_len = sizeof(*udp); - iov[2].iov_base = (void *) data; - iov[2].iov_len = len; -- udp->check = _dhcp_checksumv(iov, 3); -+ udp->uh_sum = _dhcp_checksumv(iov, 3); - - ip->ttl = IPDEFTTL; - ip->check = 0; -diff -Naur ell-0.5.orig/ell/dhcp.c ell-0.5/ell/dhcp.c ---- ell-0.5.orig/ell/dhcp.c 2018-06-09 10:07:51.465972199 -0700 -+++ ell-0.5/ell/dhcp.c 2018-06-09 10:08:35.899971403 -0700 -@@ -26,7 +26,6 @@ - - #include <netinet/ip.h> - #include <linux/types.h> --#include <linux/if_arp.h> - #include <net/ethernet.h> - #include <errno.h> - #include <time.h> diff --git a/dev-libs/ell/files/ell-0.6-musl.patch b/dev-libs/ell/files/ell-0.6-musl.patch deleted file mode 100644 index c1a1673..0000000 --- a/dev-libs/ell/files/ell-0.6-musl.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Naur ell-0.6.orig/ell/dhcp-transport.c ell-0.6/ell/dhcp-transport.c ---- ell-0.6.orig/ell/dhcp-transport.c 2018-06-26 14:29:02.357862603 -0700 -+++ ell-0.6/ell/dhcp-transport.c 2018-06-26 14:29:09.657862472 -0700 -@@ -184,12 +184,12 @@ - ip->saddr = L_CPU_TO_BE32(saddr); - ip->daddr = L_CPU_TO_BE32(daddr); - -- udp->source = L_CPU_TO_BE16(sport); -- udp->dest = L_CPU_TO_BE16(dport); -+ udp->uh_sport = L_CPU_TO_BE16(sport); -+ udp->uh_dport = L_CPU_TO_BE16(dport); - -- udp->len = L_CPU_TO_BE16(len + sizeof(*udp)); -+ udp->uh_ulen = L_CPU_TO_BE16(len + sizeof(*udp)); - -- ip->check = udp->len; -+ ip->check = udp->uh_ulen; - - iov[0].iov_base = &ip->ttl; - iov[0].iov_len = sizeof(*ip) - 8; -@@ -197,7 +197,7 @@ - iov[1].iov_len = sizeof(*udp); - iov[2].iov_base = (void *) data; - iov[2].iov_len = len; -- udp->check = _dhcp_checksumv(iov, 3); -+ udp->uh_sum = _dhcp_checksumv(iov, 3); - - ip->ttl = IPDEFTTL; - ip->check = 0; -diff -Naur ell-0.6.orig/ell/dhcp.c ell-0.6/ell/dhcp.c ---- ell-0.6.orig/ell/dhcp.c 2018-06-26 14:29:02.360862602 -0700 -+++ ell-0.6/ell/dhcp.c 2018-06-26 14:29:15.918862360 -0700 -@@ -27,7 +27,6 @@ - #include <netinet/ip.h> - #include <net/ethernet.h> - #include <linux/types.h> --#include <linux/if_arp.h> - #include <errno.h> - #include <time.h> - diff --git a/dev-libs/ell/metadata.xml b/dev-libs/ell/metadata.xml deleted file mode 100644 index 01db0cd..0000000 --- a/dev-libs/ell/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Lars Wendler</name> - </maintainer> - <use> - <flag name="glib">Enable <pkg>dev-libs/glib</pkg> support</flag> - </use> -</pkgmetadata>
