diff options
Diffstat (limited to 'meta/recipes-core/ell')
-rw-r--r-- | meta/recipes-core/ell/ell/0001-build-fix-time.h-related-breakage-on-musl.patch | 79 | ||||
-rw-r--r-- | meta/recipes-core/ell/ell_0.51.bb (renamed from meta/recipes-core/ell/ell_0.50.bb) | 3 |
2 files changed, 81 insertions, 1 deletions
diff --git a/meta/recipes-core/ell/ell/0001-build-fix-time.h-related-breakage-on-musl.patch b/meta/recipes-core/ell/ell/0001-build-fix-time.h-related-breakage-on-musl.patch new file mode 100644 index 0000000000..02b5a9f21e --- /dev/null +++ b/meta/recipes-core/ell/ell/0001-build-fix-time.h-related-breakage-on-musl.patch | |||
@@ -0,0 +1,79 @@ | |||
1 | From cd9513a025174181b66ac13de45813f6e15727d3 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Milan=20P=2E=20Stani=C4=87?= <mps@arvanta.net> | ||
3 | Date: Mon, 6 Jun 2022 22:05:39 +0200 | ||
4 | Subject: [PATCH] build: fix time.h related breakage on musl | ||
5 | |||
6 | missing time.h for struct timeval usage | ||
7 | forward declaration of struct timeval in time-private.h | ||
8 | |||
9 | Upstream-Status: Backport | ||
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
11 | --- | ||
12 | ell/dhcp-transport.c | 1 + | ||
13 | ell/dhcp6-transport.c | 1 + | ||
14 | ell/icmp6.c | 1 + | ||
15 | ell/time-private.h | 2 +- | ||
16 | ell/time.c | 1 + | ||
17 | 5 files changed, 5 insertions(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/ell/dhcp-transport.c b/ell/dhcp-transport.c | ||
20 | index ef030de..c4cf0ca 100644 | ||
21 | --- a/ell/dhcp-transport.c | ||
22 | +++ b/ell/dhcp-transport.c | ||
23 | @@ -40,6 +40,7 @@ | ||
24 | #include <linux/filter.h> | ||
25 | #include <net/if_arp.h> | ||
26 | #include <errno.h> | ||
27 | +#include <sys/time.h> | ||
28 | |||
29 | #include "io.h" | ||
30 | #include "util.h" | ||
31 | diff --git a/ell/dhcp6-transport.c b/ell/dhcp6-transport.c | ||
32 | index 30c425f..5ff6516 100644 | ||
33 | --- a/ell/dhcp6-transport.c | ||
34 | +++ b/ell/dhcp6-transport.c | ||
35 | @@ -35,6 +35,7 @@ | ||
36 | #include <net/if.h> | ||
37 | #include <unistd.h> | ||
38 | #include <errno.h> | ||
39 | +#include <sys/time.h> | ||
40 | |||
41 | #include "private.h" | ||
42 | #include "missing.h" | ||
43 | diff --git a/ell/icmp6.c b/ell/icmp6.c | ||
44 | index 368977f..7319903 100644 | ||
45 | --- a/ell/icmp6.c | ||
46 | +++ b/ell/icmp6.c | ||
47 | @@ -36,6 +36,7 @@ | ||
48 | #include <net/if.h> | ||
49 | #include <unistd.h> | ||
50 | #include <errno.h> | ||
51 | +#include <sys/time.h> | ||
52 | |||
53 | #include "private.h" | ||
54 | #include "useful.h" | ||
55 | diff --git a/ell/time-private.h b/ell/time-private.h | ||
56 | index 5295d94..83c23dd 100644 | ||
57 | --- a/ell/time-private.h | ||
58 | +++ b/ell/time-private.h | ||
59 | @@ -19,7 +19,7 @@ | ||
60 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
61 | * | ||
62 | */ | ||
63 | - | ||
64 | +struct timeval; | ||
65 | uint64_t _time_pick_interval_secs(uint32_t min_secs, uint32_t max_secs); | ||
66 | uint64_t _time_fuzz_msecs(uint64_t ms); | ||
67 | uint64_t _time_fuzz_secs(uint32_t secs, uint32_t max_offset); | ||
68 | diff --git a/ell/time.c b/ell/time.c | ||
69 | index 10e10b0..41e5725 100644 | ||
70 | --- a/ell/time.c | ||
71 | +++ b/ell/time.c | ||
72 | @@ -26,6 +26,7 @@ | ||
73 | |||
74 | #define _GNU_SOURCE | ||
75 | #include <time.h> | ||
76 | +#include <sys/time.h> | ||
77 | |||
78 | #include "time.h" | ||
79 | #include "time-private.h" | ||
diff --git a/meta/recipes-core/ell/ell_0.50.bb b/meta/recipes-core/ell/ell_0.51.bb index 243ac01530..806833bc7d 100644 --- a/meta/recipes-core/ell/ell_0.50.bb +++ b/meta/recipes-core/ell/ell_0.51.bb | |||
@@ -15,8 +15,9 @@ DEPENDS = "dbus" | |||
15 | inherit autotools pkgconfig | 15 | inherit autotools pkgconfig |
16 | 16 | ||
17 | SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz \ | 17 | SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz \ |
18 | file://0001-build-fix-time.h-related-breakage-on-musl.patch \ | ||
18 | " | 19 | " |
19 | SRC_URI[sha256sum] = "0fe51d51c6eddc2a2784092f1dfdd1143a5ef27f15c274ecfbadd680d3a72fd9" | 20 | SRC_URI[sha256sum] = "ba86cfa4aaf10151443edd63a7687914465d969f5dda00a2c1fcb11bd85e417f" |
20 | 21 | ||
21 | do_configure:prepend () { | 22 | do_configure:prepend () { |
22 | mkdir -p ${S}/build-aux | 23 | mkdir -p ${S}/build-aux |