diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2021-02-17 19:23:43 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2021-02-17 19:24:59 -0800 |
| commit | d982e00d59c73bf118c5c03b7cae0cb9d681b411 (patch) | |
| tree | 5afce8db58b46eae482e0e437271b6edb162cf06 | |
| parent | 7b7a8412a41ba96cc19ee330c764753fdb04ceb8 (diff) | |
| download | meta-openembedded-contrib-d982e00d59c73bf118c5c03b7cae0cb9d681b411.tar.gz | |
liburing: Do not build examples on risc/musl
it needs ucontext for building examples and its not implemented yet for
riscv
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/liburing/liburing/0001-do-not-build-examples.patch | 30 | ||||
| -rw-r--r-- | meta-oe/recipes-support/liburing/liburing_0.7.bb | 7 |
2 files changed, 36 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/liburing/liburing/0001-do-not-build-examples.patch b/meta-oe/recipes-support/liburing/liburing/0001-do-not-build-examples.patch new file mode 100644 index 0000000000..19bf14708b --- /dev/null +++ b/meta-oe/recipes-support/liburing/liburing/0001-do-not-build-examples.patch @@ -0,0 +1,30 @@ +From 3ee2f1e231bde18a99f86da747a9b8feca3c179d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 17 Feb 2021 19:18:16 -0800 +Subject: [PATCH] do not build examples + +examples need ucontext and some architectures on musl do not have it +implemented e.g. riscv + +Upstream-Status: Inappropriate [Arch-Specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 948e004..8b63024 100644 +--- a/Makefile ++++ b/Makefile +@@ -11,7 +11,6 @@ default: all + all: + @$(MAKE) -C src + @$(MAKE) -C test +- @$(MAKE) -C examples + + partcheck: all + @echo "make partcheck => TODO add tests with out kernel support" +-- +2.30.1 + diff --git a/meta-oe/recipes-support/liburing/liburing_0.7.bb b/meta-oe/recipes-support/liburing/liburing_0.7.bb index e122a907cd..d79389a696 100644 --- a/meta-oe/recipes-support/liburing/liburing_0.7.bb +++ b/meta-oe/recipes-support/liburing/liburing_0.7.bb @@ -12,6 +12,9 @@ LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=d51b5805e2a675685e SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https \ file://0001-test-Fix-build-on-32bit-architectures-with-6bit-time.patch \ " +SRC_URI_append_libc-musl_riscv64 = " file://0001-do-not-build-examples.patch " +SRC_URI_append_libc-musl_riscv32 = " file://0001-do-not-build-examples.patch " + SRCREV = "45f0735219a615ae848033c47c7e2d85d101d43e" S = "${WORKDIR}/git" @@ -20,7 +23,9 @@ XCFLAGS = "-pthread" XCFLAGS_append_libc-musl = " -lucontext" EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'LDFLAGS=${LDFLAGS}' 'XCFLAGS=${XCFLAGS}' 'BUILDDIR=${S}'" - +do_configure() { + ${S}/configure --prefix=${prefix} +} do_install () { oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} INCLUDEDIR=${includedir} } |