* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ell/, dev-libs/ell/files/
@ 2022-06-09 4:22 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-06-09 4:22 UTC (permalink / raw
To: gentoo-commits
commit: 3e40af896261ebb411fb8b03d87af166a0b27326
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 9 04:22:31 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 9 04:22:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e40af89
dev-libs/ell: backport musl build fix
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/ell/ell-0.51.ebuild | 4 ++
dev-libs/ell/files/ell-0.51-musl-build-time.patch | 60 +++++++++++++++++++++++
2 files changed, 64 insertions(+)
diff --git a/dev-libs/ell/ell-0.51.ebuild b/dev-libs/ell/ell-0.51.ebuild
index 56c48e4f83d1..f7963d87ac96 100644
--- a/dev-libs/ell/ell-0.51.ebuild
+++ b/dev-libs/ell/ell-0.51.ebuild
@@ -33,6 +33,10 @@ CONFIG_CHECK="
~KEY_DH_OPERATIONS
"
+PATCHES=(
+ "${FILESDIR}"/${P}-musl-build-time.patch
+)
+
src_prepare() {
default
[[ "${PV}" == *9999 ]] && eautoreconf
diff --git a/dev-libs/ell/files/ell-0.51-musl-build-time.patch b/dev-libs/ell/files/ell-0.51-musl-build-time.patch
new file mode 100644
index 000000000000..201bc7994406
--- /dev/null
+++ b/dev-libs/ell/files/ell-0.51-musl-build-time.patch
@@ -0,0 +1,60 @@
+https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=ce7fcfe194f0abcb8f419f83276b16a4ab274032
+
+From: "Milan P. Stanić" <mps@arvanta.net>
+Date: Mon, 6 Jun 2022 22:05:39 +0200
+Subject: build: fix time.h related breakage on musl
+
+missing time.h for struct timeval usage
+forward declaration of struct timeval in time-private.h
+--- a/ell/dhcp-transport.c
++++ b/ell/dhcp-transport.c
+@@ -40,6 +40,7 @@
+ #include <linux/filter.h>
+ #include <net/if_arp.h>
+ #include <errno.h>
++#include <sys/time.h>
+
+ #include "io.h"
+ #include "util.h"
+--- a/ell/dhcp6-transport.c
++++ b/ell/dhcp6-transport.c
+@@ -35,6 +35,7 @@
+ #include <net/if.h>
+ #include <unistd.h>
+ #include <errno.h>
++#include <sys/time.h>
+
+ #include "private.h"
+ #include "missing.h"
+--- a/ell/icmp6.c
++++ b/ell/icmp6.c
+@@ -36,6 +36,7 @@
+ #include <net/if.h>
+ #include <unistd.h>
+ #include <errno.h>
++#include <sys/time.h>
+
+ #include "private.h"
+ #include "useful.h"
+--- a/ell/time-private.h
++++ b/ell/time-private.h
+@@ -19,7 +19,7 @@
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+-
++struct timeval;
+ uint64_t _time_pick_interval_secs(uint32_t min_secs, uint32_t max_secs);
+ uint64_t _time_fuzz_msecs(uint64_t ms);
+ uint64_t _time_fuzz_secs(uint32_t secs, uint32_t max_offset);
+--- a/ell/time.c
++++ b/ell/time.c
+@@ -26,6 +26,7 @@
+
+ #define _GNU_SOURCE
+ #include <time.h>
++#include <sys/time.h>
+
+ #include "time.h"
+ #include "time-private.h"
+cgit
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ell/, dev-libs/ell/files/
@ 2022-10-28 18:50 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2022-10-28 18:50 UTC (permalink / raw
To: gentoo-commits
commit: 2557d59fa9af704b3e07c8ce3156f12ce40a2662
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 18:02:45 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 18:47:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2557d59f
dev-libs/ell: drop 0.51, 0.52-r1
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/ell/Manifest | 2 -
dev-libs/ell/ell-0.51.ebuild | 60 -----------------------
dev-libs/ell/ell-0.52-r1.ebuild | 54 --------------------
dev-libs/ell/files/ell-0.51-musl-build-time.patch | 60 -----------------------
4 files changed, 176 deletions(-)
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index f0789e915100..891b3bee4850 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,3 +1 @@
-DIST ell-0.51.tar.xz 544744 BLAKE2B ae9cd3bc2d892109f5ae1a602f0f711b350ceb10ce2a7fcced5ce4bca63986a69c350013fc08eed29c9c626cc892b70ba997dda321d7c6c089d465850fabd5e1 SHA512 c2fd2ea9858542e23d46eba96045e1c924531b6a436401e86d838ffee39d0062923861c2898dae76ec9bfb325327c97b13799d81a2324982928b07b1fb898595
-DIST ell-0.52.tar.xz 548816 BLAKE2B 9c2ac4128fe770c1d1a1532fca8a5e36fcb620b9908177acb4fa8f35cea733374199fbe55ae78aac25ff5e37ee71044b6296a38fbbf7ff23fa867e2a338b8287 SHA512 e3cad20e42b71a7c1aae2c8bebe025f7a2bd0e594738aba96ffe8b316e216eb57dc86a5f0b0837d8141b16cae4f150c7b472c60d455feec5d7eb340b960c26d4
DIST ell-0.53.tar.xz 550296 BLAKE2B d68952a0d899d8d346aa9e491b19fc5fbe845fd607446b4c16f09816c3d8b38f576a08cf994fdc49d794847277cdbe6483a147146ed4adaafa47c269846d78b5 SHA512 4ebe79834acabaec411bece7d81f50d7d6ea8f5d330769bbeb20596df6c2885ff584f589b6f5bbf9607e1a52158151d6940d4a1438b4aa610d42c38882366ed7
diff --git a/dev-libs/ell/ell-0.51.ebuild b/dev-libs/ell/ell-0.51.ebuild
deleted file mode 100644
index 094d7615adac..000000000000
--- a/dev-libs/ell/ell-0.51.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info multilib-minimal
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://01.org/ell"
-if [[ "${PV}" == *9999 ]] ; then
- inherit autotools git-r3
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
- SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
-fi
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="pie test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="test? ( sys-apps/dbus )"
-
-CONFIG_CHECK="
- ~TIMERFD
- ~EVENTFD
- ~CRYPTO_USER_API
- ~CRYPTO_USER_API_HASH
- ~CRYPTO_MD5
- ~CRYPTO_SHA1
- ~KEY_DH_OPERATIONS
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-musl-build-time.patch
-)
-
-src_prepare() {
- default
- sed -i -e "s#/tmp/ell-test-bus#/tmp/ell-test-bus-$(uuidgen)#" \
- unit/test-dbus*.c unit/dbus.conf || die
- [[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-multilib_src_configure() {
- append-cflags "-fsigned-char" #662694
- local myeconfargs=(
- $(use_enable pie)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- local DOCS=( ChangeLog README )
- einstalldocs
-
- find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/ell/ell-0.52-r1.ebuild b/dev-libs/ell/ell-0.52-r1.ebuild
deleted file mode 100644
index 0220fd7c1acc..000000000000
--- a/dev-libs/ell/ell-0.52-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info
-
-DESCRIPTION="Embedded Linux Library provides core, low-level functionality for system daemons"
-HOMEPAGE="https://01.org/ell"
-if [[ "${PV}" == *9999 ]] ; then
- inherit autotools git-r3
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
- SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
-fi
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="pie test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( sys-apps/dbus )"
-
-CONFIG_CHECK="
- ~TIMERFD
- ~EVENTFD
- ~CRYPTO_USER_API
- ~CRYPTO_USER_API_HASH
- ~CRYPTO_MD5
- ~CRYPTO_SHA1
- ~KEY_DH_OPERATIONS
-"
-
-src_prepare() {
- default
- sed -i -e "s#/tmp/ell-test-bus#/tmp/ell-test-bus-$(uuidgen)#" \
- unit/test-dbus*.c unit/dbus.conf || die
- [[ "${PV}" == *9999 ]] && eautoreconf
-}
-
-src_configure() {
- append-cflags "-fsigned-char" #662694
- local myeconfargs=(
- $(use_enable pie)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- find "${ED}" -name "*.la" -delete || die
-}
diff --git a/dev-libs/ell/files/ell-0.51-musl-build-time.patch b/dev-libs/ell/files/ell-0.51-musl-build-time.patch
deleted file mode 100644
index 201bc7994406..000000000000
--- a/dev-libs/ell/files/ell-0.51-musl-build-time.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://git.kernel.org/pub/scm/libs/ell/ell.git/commit/?id=ce7fcfe194f0abcb8f419f83276b16a4ab274032
-
-From: "Milan P. Stanić" <mps@arvanta.net>
-Date: Mon, 6 Jun 2022 22:05:39 +0200
-Subject: build: fix time.h related breakage on musl
-
-missing time.h for struct timeval usage
-forward declaration of struct timeval in time-private.h
---- a/ell/dhcp-transport.c
-+++ b/ell/dhcp-transport.c
-@@ -40,6 +40,7 @@
- #include <linux/filter.h>
- #include <net/if_arp.h>
- #include <errno.h>
-+#include <sys/time.h>
-
- #include "io.h"
- #include "util.h"
---- a/ell/dhcp6-transport.c
-+++ b/ell/dhcp6-transport.c
-@@ -35,6 +35,7 @@
- #include <net/if.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <sys/time.h>
-
- #include "private.h"
- #include "missing.h"
---- a/ell/icmp6.c
-+++ b/ell/icmp6.c
-@@ -36,6 +36,7 @@
- #include <net/if.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <sys/time.h>
-
- #include "private.h"
- #include "useful.h"
---- a/ell/time-private.h
-+++ b/ell/time-private.h
-@@ -19,7 +19,7 @@
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
--
-+struct timeval;
- uint64_t _time_pick_interval_secs(uint32_t min_secs, uint32_t max_secs);
- uint64_t _time_fuzz_msecs(uint64_t ms);
- uint64_t _time_fuzz_secs(uint32_t secs, uint32_t max_offset);
---- a/ell/time.c
-+++ b/ell/time.c
-@@ -26,6 +26,7 @@
-
- #define _GNU_SOURCE
- #include <time.h>
-+#include <sys/time.h>
-
- #include "time.h"
- #include "time-private.h"
-cgit
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-28 18:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-28 18:50 [gentoo-commits] repo/gentoo:master commit in: dev-libs/ell/, dev-libs/ell/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-06-09 4:22 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox