mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-05 14:59:55 +00:00
liburing: Upgrade to 2.5
Changelogs are here [1] [1] https://github.com/axboe/liburing/commit/f4e42a515cd78c8c9cac2be14222834be5f8df2b Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
-34
@@ -1,34 +0,0 @@
|
||||
From c34dca74854cb6e7f2b09affa2a4ab0145e62371 Mon Sep 17 00:00:00 2001
|
||||
From: Kartik Mahajan <stonebrakert6@gmail.com>
|
||||
Date: Fri, 30 Jun 2023 11:34:07 +0530
|
||||
Subject: [PATCH] Fixes build failure on ./configure && make
|
||||
--shuffle=2836571325
|
||||
|
||||
./configure && make --shuffle=2836571325 fails.
|
||||
The build fails on parallel builds for me and above command reproduces it.
|
||||
Note that --shuffle options is available on make version >= 4.4
|
||||
Target ffi_libname in src/Makefile should have a additional dependency
|
||||
upon $(liburing_sobjs)
|
||||
|
||||
Upstream-Status: Backport [https://github.com/axboe/liburing/commit/c34dca74854cb6e7f2b09affa2a4ab0145e62371]
|
||||
Signed-off-by: Kartik Mahajan <stonebrakert6@gmail.com>
|
||||
---
|
||||
src/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
index c4c28cb..7832095 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -81,7 +81,7 @@ liburing-ffi.a: $(liburing_objs) $(liburing_ffi_objs)
|
||||
$(libname): $(liburing_sobjs) liburing.map
|
||||
$(QUIET_CC)$(CC) $(SO_CFLAGS) -shared -Wl,--version-script=liburing.map -Wl,-soname=$(soname) -o $@ $(liburing_sobjs) $(LINK_FLAGS)
|
||||
|
||||
-$(ffi_libname): $(liburing_ffi_objs) $(liburing_ffi_sobjs) liburing-ffi.map
|
||||
+$(ffi_libname): $(liburing_ffi_objs) $(liburing_ffi_sobjs) $(liburing_sobjs) liburing-ffi.map
|
||||
$(QUIET_CC)$(CC) $(SO_CFLAGS) -shared -Wl,--version-script=liburing-ffi.map -Wl,-soname=$(ffi_soname) -o $@ $(liburing_sobjs) $(liburing_ffi_sobjs) $(LINK_FLAGS)
|
||||
|
||||
install: $(all_targets)
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
From 653c39b0b30b2a329db5041e558cfc97c03d6bfb 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 5d9c4dc..53e1615 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -11,7 +11,6 @@ default: all
|
||||
all:
|
||||
@$(MAKE) -C src
|
||||
@$(MAKE) -C test
|
||||
- @$(MAKE) -C examples
|
||||
|
||||
.PHONY: all install default clean test
|
||||
.PHONY: FORCE cscope
|
||||
--
|
||||
2.31.1
|
||||
|
||||
+2
-5
@@ -9,11 +9,8 @@ SECTION = "libs"
|
||||
LICENSE = "LGPL-2.1-only | MIT"
|
||||
LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=2b0e9926530c269f5ae95560370195af"
|
||||
|
||||
SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https \
|
||||
file://0001-Fixes-build-failure-on-.-configure-make-shuffle-2836.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 = "298c083d75ecde5a8833366167b3b6abff0c8d39"
|
||||
SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https"
|
||||
SRCREV = "f4e42a515cd78c8c9cac2be14222834be5f8df2b"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
Reference in New Issue
Block a user