diff options
| author | Max Krummenacher <max.oss.09@gmail.com> | 2026-05-30 15:59:41 +0200 |
|---|---|---|
| committer | Khem Raj <khem.raj@oss.qualcomm.com> | 2026-06-07 18:21:33 -0700 |
| commit | 1f265bd73deee6142a6dca9fd80d0708715cbc5b (patch) | |
| tree | 12706ea5dda962dcc0eac1b4c5642c2c18336edf /meta-oe | |
| parent | 357c098d2d66c51d52e9e13ac433131d6c090f00 (diff) | |
| download | meta-openembedded-1f265bd73deee6142a6dca9fd80d0708715cbc5b.tar.gz | |
fio: fix build with musl
Backport the upstream fix.
Signed-off-by: Max Krummenacher <max.oss.09@gmail.com>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-benchmark/fio/fio/0001-backend-remove-linux-prctl.h-include-to-fix-musl-con.patch | 33 | ||||
| -rw-r--r-- | meta-oe/recipes-benchmark/fio/fio_3.42.bb | 1 |
2 files changed, 34 insertions, 0 deletions
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 0000000000..9019e06f26 --- /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 @@ | |||
| 1 | From 82688fff1241549177ed4d55c27c93117d738947 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Lucas Hecht <lucas.hecht@agdsn.de> | ||
| 3 | Date: Tue, 26 May 2026 18:49:48 +0200 | ||
| 4 | Subject: [PATCH] backend: remove linux/prctl.h include to fix musl conflict | ||
| 5 | |||
| 6 | Building with musl fails due to a duplicate definition of prctl_mm_map. | ||
| 7 | This is because musl redefines linux/prctl.h in sys/prctl.h. | ||
| 8 | |||
| 9 | This commit removes the linux/prctl.h include. | ||
| 10 | |||
| 11 | Fixes: #2096 | ||
| 12 | |||
| 13 | Upstream-Status: Backport [a84eece62edd46c1f4c8047f1052ac6181fc8b3e] | ||
| 14 | Signed-off-by: Lucas Hecht <lucas.hecht@agdsn.de> | ||
| 15 | --- | ||
| 16 | backend.c | 1 - | ||
| 17 | 1 file changed, 1 deletion(-) | ||
| 18 | |||
| 19 | diff --git a/backend.c b/backend.c | ||
| 20 | index 230d7fd07965..cfc411531818 100644 | ||
| 21 | --- a/backend.c | ||
| 22 | +++ b/backend.c | ||
| 23 | @@ -32,7 +32,6 @@ | ||
| 24 | #include <pthread.h> | ||
| 25 | |||
| 26 | #ifdef CONFIG_LINUX | ||
| 27 | -#include <linux/prctl.h> | ||
| 28 | #include <sys/prctl.h> | ||
| 29 | #endif | ||
| 30 | |||
| 31 | -- | ||
| 32 | 2.51.0 | ||
| 33 | |||
diff --git a/meta-oe/recipes-benchmark/fio/fio_3.42.bb b/meta-oe/recipes-benchmark/fio/fio_3.42.bb index dac7548d08..966ae644b4 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" | |||
| 24 | 24 | ||
| 25 | SRC_URI = " \ | 25 | SRC_URI = " \ |
| 26 | git://git.kernel.dk/fio.git;branch=master;tag=${BP} \ | 26 | git://git.kernel.dk/fio.git;branch=master;tag=${BP} \ |
| 27 | file://0001-backend-remove-linux-prctl.h-include-to-fix-musl-con.patch \ | ||
| 27 | " | 28 | " |
| 28 | SRCREV = "ab77643023f5d7e3c1b71a7576a564f368bf577a" | 29 | SRCREV = "ab77643023f5d7e3c1b71a7576a564f368bf577a" |
| 29 | 30 | ||
