diff options
-rw-r--r-- | meta/recipes-support/libbsd/libbsd/0001-funopen-Replace-off64_t-with-off_t-in-funopen_seek.patch | 34 | ||||
-rw-r--r-- | meta/recipes-support/libbsd/libbsd_0.11.8.bb (renamed from meta/recipes-support/libbsd/libbsd_0.11.7.bb) | 11 |
2 files changed, 3 insertions, 42 deletions
diff --git a/meta/recipes-support/libbsd/libbsd/0001-funopen-Replace-off64_t-with-off_t-in-funopen_seek.patch b/meta/recipes-support/libbsd/libbsd/0001-funopen-Replace-off64_t-with-off_t-in-funopen_seek.patch deleted file mode 100644 index 45ecef041b..0000000000 --- a/meta/recipes-support/libbsd/libbsd/0001-funopen-Replace-off64_t-with-off_t-in-funopen_seek.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From 9c4e5f8984e46344c9e150764b8aa0a7a70b6cb5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 15 Dec 2022 09:02:22 -0800 | ||
4 | Subject: [PATCH] funopen: Replace off64_t with off_t in funopen_seek | ||
5 | |||
6 | AC_SYS_LARGEFILE in configure.ac is setting needed defines to make | ||
7 | 64bit off_t on relevant platforms. | ||
8 | |||
9 | Fixes build on musl | ||
10 | |||
11 | | ../../../../../../../../workspace/sources/libbsd/src/funopen.c:68:28: error: unknown type name 'off64_t'; did you mean 'off_t'? | ||
12 | | funopen_seek(void *cookie, off64_t *offset, int whence) | ||
13 | | ^~~~~~~ | ||
14 | | off_t | ||
15 | |||
16 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/libbsd/libbsd/-/merge_requests/24] | ||
17 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
18 | --- | ||
19 | src/funopen.c | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/src/funopen.c b/src/funopen.c | ||
23 | index 1e6f43a..a9b40e8 100644 | ||
24 | --- a/src/funopen.c | ||
25 | +++ b/src/funopen.c | ||
26 | @@ -65,7 +65,7 @@ funopen_write(void *cookie, const char *buf, size_t size) | ||
27 | } | ||
28 | |||
29 | static int | ||
30 | -funopen_seek(void *cookie, off64_t *offset, int whence) | ||
31 | +funopen_seek(void *cookie, off_t *offset, int whence) | ||
32 | { | ||
33 | struct funopen_cookie *cookiewrap = cookie; | ||
34 | off_t soff = *offset; | ||
diff --git a/meta/recipes-support/libbsd/libbsd_0.11.7.bb b/meta/recipes-support/libbsd/libbsd_0.11.8.bb index 5c958f950e..17049c8c28 100644 --- a/meta/recipes-support/libbsd/libbsd_0.11.7.bb +++ b/meta/recipes-support/libbsd/libbsd_0.11.8.bb | |||
@@ -1,6 +1,3 @@ | |||
1 | # Copyright (C) 2013 Khem Raj <raj.khem@gmail.com> | ||
2 | # Released under the MIT license (see COPYING.MIT for the terms) | ||
3 | |||
4 | SUMMARY = "Library of utility functions from BSD systems" | 1 | SUMMARY = "Library of utility functions from BSD systems" |
5 | DESCRIPTION = "This library provides useful functions commonly found on BSD systems, \ | 2 | DESCRIPTION = "This library provides useful functions commonly found on BSD systems, \ |
6 | and lacking on others like GNU systems, thus making it easier to port \ | 3 | and lacking on others like GNU systems, thus making it easier to port \ |
@@ -36,14 +33,12 @@ LICENSE:${PN}-locale = "BSD-3-Clause & ISC & PD" | |||
36 | LICENSE:${PN}-src = "BSD-3-Clause & ISC & PD" | 33 | LICENSE:${PN}-src = "BSD-3-Clause & ISC & PD" |
37 | LICENSE:${PN}-staticdev = "BSD-3-Clause & ISC & PD" | 34 | LICENSE:${PN}-staticdev = "BSD-3-Clause & ISC & PD" |
38 | 35 | ||
39 | LIC_FILES_CHKSUM = "file://COPYING;md5=75e85c5a558f86d10fbd5abc567ea5e6" | 36 | LIC_FILES_CHKSUM = "file://COPYING;md5=befe09fada57bdcf7f7c12f51081b08f" |
40 | SECTION = "libs" | 37 | SECTION = "libs" |
41 | 38 | ||
42 | SRC_URI = "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ | 39 | SRC_URI = "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz" |
43 | file://0001-funopen-Replace-off64_t-with-off_t-in-funopen_seek.patch \ | ||
44 | " | ||
45 | 40 | ||
46 | SRC_URI[sha256sum] = "9baa186059ebbf25c06308e9f991fda31f7183c0f24931826d83aa6abd8a0261" | 41 | SRC_URI[sha256sum] = "55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33" |
47 | 42 | ||
48 | inherit autotools pkgconfig | 43 | inherit autotools pkgconfig |
49 | 44 | ||