diff mbox series

[meta-oe] fio: fix build with musl

Message ID 20260530135941.294665-1-max.oss.09@gmail.com
State New
Headers show
Series [meta-oe] fio: fix build with musl | expand

Commit Message

Max Krummenacher May 30, 2026, 1:59 p.m. UTC 
Backport the upstream fix.

Signed-off-by: Max Krummenacher <max.oss.09@gmail.com>
---
 ...inux-prctl.h-include-to-fix-musl-con.patch | 33 +++++++++++++++++++
 meta-oe/recipes-benchmark/fio/fio_3.42.bb     |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 meta-oe/recipes-benchmark/fio/fio/0001-backend-remove-linux-prctl.h-include-to-fix-musl-con.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-benchmark/fio/fio/0001-backend-remove-linux-prctl.h-include-to-fix-musl-con.patch b/meta-oe/recipes-benchmark/fio/fio/0001-backend-remove-linux-prctl.h-include-to-fix-musl-con.patch
new file mode 100644
index 000000000000..9019e06f2676
--- /dev/null
+++ b/meta-oe/recipes-benchmark/fio/fio/0001-backend-remove-linux-prctl.h-include-to-fix-musl-con.patch
@@ -0,0 +1,33 @@ 
+From 82688fff1241549177ed4d55c27c93117d738947 Mon Sep 17 00:00:00 2001
+From: Lucas Hecht <lucas.hecht@agdsn.de>
+Date: Tue, 26 May 2026 18:49:48 +0200
+Subject: [PATCH] backend: remove linux/prctl.h include to fix musl conflict
+
+Building with musl fails due to a duplicate definition of prctl_mm_map.
+This is because musl redefines linux/prctl.h in sys/prctl.h.
+
+This commit removes the linux/prctl.h include.
+
+Fixes: #2096
+
+Upstream-Status: Backport [a84eece62edd46c1f4c8047f1052ac6181fc8b3e]
+Signed-off-by: Lucas Hecht <lucas.hecht@agdsn.de>
+---
+ backend.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/backend.c b/backend.c
+index 230d7fd07965..cfc411531818 100644
+--- a/backend.c
++++ b/backend.c
+@@ -32,7 +32,6 @@
+ #include <pthread.h>
+ 
+ #ifdef CONFIG_LINUX
+-#include <linux/prctl.h>
+ #include <sys/prctl.h>
+ #endif
+ 
+-- 
+2.51.0
+
diff --git a/meta-oe/recipes-benchmark/fio/fio_3.42.bb b/meta-oe/recipes-benchmark/fio/fio_3.42.bb
index dac7548d0835..966ae644b417 100644
--- a/meta-oe/recipes-benchmark/fio/fio_3.42.bb
+++ b/meta-oe/recipes-benchmark/fio/fio_3.42.bb
@@ -24,6 +24,7 @@  PACKAGECONFIG[numa] = ",--disable-numa,numactl"
 
 SRC_URI = " \
     git://git.kernel.dk/fio.git;branch=master;tag=${BP} \
+    file://0001-backend-remove-linux-prctl.h-include-to-fix-musl-con.patch \
 "
 SRCREV = "ab77643023f5d7e3c1b71a7576a564f368bf577a"