aports/main/liburing/busybox-mktemp.patch
psykose c2d2cf9d2a
main/liburing: fix include headers
fixes #13813

previously, a bug in the configure script prevented liburing from
properly detecting the linux kernel headers and redefined some structs,
which made the liburing headers incompatible
2022-05-16 11:49:07 +02:00

55 lines
1.8 KiB
Diff

Patch-Source: https://github.com/axboe/liburing/commit/cce3026ee45a86cfdd104fd1be270b759a161233
From cce3026ee45a86cfdd104fd1be270b759a161233 Mon Sep 17 00:00:00 2001
From: Nugra <richiisei@gmail.com>
Date: Tue, 15 Feb 2022 22:36:50 +0700
Subject: [PATCH] configure: Support busybox mktemp
Busybox mktemp does not support `--tmpdir`, it says:
mktemp: unrecognized option: tmpdir
It can be fixed with:
1. Create a temporary directory.
2. Use touch to create the temporary files inside the directory.
3. Clean up by deleting the temporary directory.
[ammarfaizi2: s/fio/liburing/]
Signed-off-by: Nugra <richiisei@gmail.com>
Link: https://t.me/GNUWeeb/530154
[ammarfaizi2: Rephrase the commit message and add touch command]
Co-authored-by: Ammar Faizi <ammarfaizi2@gnuweeb.org>
Signed-off-by: Ammar Faizi <ammarfaizi2@gnuweeb.org>
Link: https://lore.kernel.org/r/20220215153651.181319-2-ammarfaizi2@gnuweeb.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
configure | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index 805a67109..1f7f1c334 100755
--- a/configure
+++ b/configure
@@ -78,14 +78,17 @@ EOF
exit 0
fi
-TMPC="$(mktemp --tmpdir fio-conf-XXXXXXXXXX.c)"
-TMPC2="$(mktemp --tmpdir fio-conf-XXXXXXXXXX-2.c)"
-TMPO="$(mktemp --tmpdir fio-conf-XXXXXXXXXX.o)"
-TMPE="$(mktemp --tmpdir fio-conf-XXXXXXXXXX.exe)"
+TMP_DIRECTORY="$(mktemp -d)"
+TMPC="$TMP_DIRECTORY/liburing-conf.c"
+TMPC2="$TMP_DIRECTORY/liburing-conf-2.c"
+TMPO="$TMP_DIRECTORY/liburing-conf.o"
+TMPE="$TMP_DIRECTORY/liburing-conf.exe"
+
+touch $TMPC $TMPC2 $TMPO $TMPE
# NB: do not call "exit" in the trap handler; this is buggy with some shells;
# see <1285349658-3122-1-git-send-email-loic.minier@linaro.org>
-trap "rm -f $TMPC $TMPC2 $TMPO $TMPE" EXIT INT QUIT TERM
+trap "rm -rf $TMP_DIRECTORY" EXIT INT QUIT TERM
rm -rf config.log