Skip to content
Snippets Groups Projects
Commit cee7a0ea authored by Milan P. Stanić's avatar Milan P. Stanić
Browse files

main/ell: upgrade to 0.51

add upstream patch to fix build with musl
parent 51e02766
No related branches found
No related tags found
2 merge requests!39304[3.16] main/expat: security upgrade to 2.4.9,!35131main/ell: upgrade to 0.51
Pipeline #124565 canceled
From 0cee9267ef95b3a13917e042dc205bc24be9328e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=2E=20Stani=C4=87?= <mps@arvanta.net>
Date: Mon, 6 Jun 2022 17:05:48 +0000
Subject: [PATCH] build: fix time.h related breakage on musl
missing time.h for struct timeval usage
forward declaration of struct timeval in time-private.h
---
ell/dhcp-transport.c | 1 +
ell/dhcp6-transport.c | 1 +
ell/icmp6.c | 1 +
ell/time-private.h | 2 +-
ell/time.c | 1 +
5 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/ell/dhcp-transport.c b/ell/dhcp-transport.c
index ef030de..c4cf0ca 100644
--- 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"
diff --git a/ell/dhcp6-transport.c b/ell/dhcp6-transport.c
index 30c425f..5ff6516 100644
--- 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"
diff --git a/ell/icmp6.c b/ell/icmp6.c
index 368977f..7319903 100644
--- 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"
diff --git a/ell/time-private.h b/ell/time-private.h
index 5295d94..83c23dd 100644
--- 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);
diff --git a/ell/time.c b/ell/time.c
index 10e10b0..41e5725 100644
--- 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"
--
2.36.1
# Contributor: Milan P. Stanić <mps@arvanta.net>
# Maintainer: Milan P. Stanić <mps@arvanta.net>
pkgname=ell
pkgver=0.50
pkgver=0.51
pkgrel=0
pkgdesc="Linux library for embedded development"
url="https://01.org/ell"
......@@ -11,6 +11,7 @@ makedepends="glib-dev linux-headers"
checkdepends="dbus"
subpackages="$pkgname-dev"
source="https://mirrors.edge.kernel.org/pub/linux/libs/ell/ell-$pkgver.tar.gz
0001-build-fix-time.h-related-breakage-on-musl.patch
"
case "$CARCH" in
......@@ -38,5 +39,6 @@ package() {
}
sha512sums="
123a789306d23e9050611ab69fec1e1d14ab11f2705b32ff82a54d2d2cbca9fa743a129aacae4df098fa006d21f8151b3492dc56b3510b5b51571a67fdd9cb39 ell-0.50.tar.gz
7b7897ea094ad90eeae98594f701b846f4f8c25cddab7ad2b38676d3b6369f26013e3f9f40086ae5e602325aa14daadc4d7923dea4609271d5ed11586eb9969d ell-0.51.tar.gz
9543fb27bf364848798e9219de57e8fa60b46372ff0719769d413957098ed4ee6835a4a2661536214a8bcd48b94f8a30217770eb243be01669f8d47fbec11c3d 0001-build-fix-time.h-related-breakage-on-musl.patch
"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment