diff options
| author | Khem Raj <raj.khem@gmail.com> | 2023-02-18 18:12:42 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2023-02-18 18:13:51 -0800 |
| commit | 1877172e97d4a48ec9805a02b870ac4ccc57962b (patch) | |
| tree | 87733359d23b876a21ac2e82eb2807ff9867a06b | |
| parent | 967094eed959592582a6f2c94a7e472b34f3bb36 (diff) | |
| download | meta-openembedded-1877172e97d4a48ec9805a02b870ac4ccc57962b.tar.gz | |
liburing: Update to latest tip of tree
Add a patch to fix build on musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/liburing/liburing/0001-examples-test-Remove-unused-linux-errqueue.h.patch | 47 | ||||
| -rw-r--r-- | meta-oe/recipes-support/liburing/liburing_2.3.bb | 6 |
2 files changed, 51 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/liburing/liburing/0001-examples-test-Remove-unused-linux-errqueue.h.patch b/meta-oe/recipes-support/liburing/liburing/0001-examples-test-Remove-unused-linux-errqueue.h.patch new file mode 100644 index 0000000000..21aaf8d991 --- /dev/null +++ b/meta-oe/recipes-support/liburing/liburing/0001-examples-test-Remove-unused-linux-errqueue.h.patch | |||
| @@ -0,0 +1,47 @@ | |||
| 1 | From 0fbcc44fe1fb2dc6807660b2cff1c2995add095b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Sat, 18 Feb 2023 18:01:22 -0800 | ||
| 4 | Subject: [PATCH] examples,test: Remove unused linux/errqueue.h | ||
| 5 | |||
| 6 | This header is not needed therefore remove it, this cleanup also helps | ||
| 7 | compiling on musl/clang | ||
| 8 | |||
| 9 | /usr/include/linux/errqueue.h:57:20: error: array has incomplete element typ | ||
| 10 | e 'struct timespec' | ||
| 11 | struct timespec ts[3]; | ||
| 12 | ^ | ||
| 13 | |||
| 14 | Upstream-Status: Submitted [https://github.com/axboe/liburing/pull/798] | ||
| 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 16 | --- | ||
| 17 | examples/send-zerocopy.c | 1 - | ||
| 18 | test/send-zerocopy.c | 1 - | ||
| 19 | 2 files changed, 2 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/examples/send-zerocopy.c b/examples/send-zerocopy.c | ||
| 22 | index 6092af9..cf1fa8b 100644 | ||
| 23 | --- a/examples/send-zerocopy.c | ||
| 24 | +++ b/examples/send-zerocopy.c | ||
| 25 | @@ -13,7 +13,6 @@ | ||
| 26 | #include <string.h> | ||
| 27 | |||
| 28 | #include <arpa/inet.h> | ||
| 29 | -#include <linux/errqueue.h> | ||
| 30 | #include <linux/if_packet.h> | ||
| 31 | #include <linux/ipv6.h> | ||
| 32 | #include <linux/socket.h> | ||
| 33 | diff --git a/test/send-zerocopy.c b/test/send-zerocopy.c | ||
| 34 | index 86a31cd..5d578c6 100644 | ||
| 35 | --- a/test/send-zerocopy.c | ||
| 36 | +++ b/test/send-zerocopy.c | ||
| 37 | @@ -11,7 +11,6 @@ | ||
| 38 | #include <string.h> | ||
| 39 | |||
| 40 | #include <arpa/inet.h> | ||
| 41 | -#include <linux/errqueue.h> | ||
| 42 | #include <linux/if_packet.h> | ||
| 43 | #include <linux/ipv6.h> | ||
| 44 | #include <linux/socket.h> | ||
| 45 | -- | ||
| 46 | 2.39.2 | ||
| 47 | |||
diff --git a/meta-oe/recipes-support/liburing/liburing_2.3.bb b/meta-oe/recipes-support/liburing/liburing_2.3.bb index b3da4d5e0e..ba9b7480ce 100644 --- a/meta-oe/recipes-support/liburing/liburing_2.3.bb +++ b/meta-oe/recipes-support/liburing/liburing_2.3.bb | |||
| @@ -9,11 +9,13 @@ SECTION = "libs" | |||
| 9 | LICENSE = "LGPL-2.1-only | MIT" | 9 | LICENSE = "LGPL-2.1-only | MIT" |
| 10 | LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=2b0e9926530c269f5ae95560370195af" | 10 | LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=2b0e9926530c269f5ae95560370195af" |
| 11 | 11 | ||
| 12 | SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https" | 12 | SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https \ |
| 13 | file://0001-examples-test-Remove-unused-linux-errqueue.h.patch" | ||
| 13 | SRC_URI:append:libc-musl:riscv64 = " file://0001-do-not-build-examples.patch " | 14 | SRC_URI:append:libc-musl:riscv64 = " file://0001-do-not-build-examples.patch " |
| 14 | SRC_URI:append:libc-musl:riscv32 = " file://0001-do-not-build-examples.patch " | 15 | SRC_URI:append:libc-musl:riscv32 = " file://0001-do-not-build-examples.patch " |
| 15 | SRCREV = "4915f2af869876d892a1f591ee2c21be21c6fc5c" | 16 | SRCREV = "f5cac78e621ab452d3035902085f66d2bf73243b" |
| 16 | 17 | ||
| 18 | PV .= "+2.4+git${SRCPV}" | ||
| 17 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
| 18 | 20 | ||
| 19 | DEPENDS:append:libc-musl = " libucontext" | 21 | DEPENDS:append:libc-musl = " libucontext" |
