diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2023-11-05 08:33:41 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2023-11-06 08:49:52 -0800 |
| commit | ad8a6570cafd512434af497f31f5d524af703622 (patch) | |
| tree | 3aedf0f3670f3f9b21694a88b7efc939258c01cb /meta-filesystems | |
| parent | 10e38d8f0057a305342709c95e613ed93dbe2955 (diff) | |
| download | meta-openembedded-contrib-ad8a6570cafd512434af497f31f5d524af703622.tar.gz | |
xfstests: Fix build on musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-filesystems')
| -rw-r--r-- | meta-filesystems/recipes-utils/xfstests/xfstests/0001-add-missing-FTW_-macros-when-not-available-in-libc.patch | 41 | ||||
| -rw-r--r-- | meta-filesystems/recipes-utils/xfstests/xfstests_2023.10.29.bb | 1 |
2 files changed, 42 insertions, 0 deletions
diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests/0001-add-missing-FTW_-macros-when-not-available-in-libc.patch b/meta-filesystems/recipes-utils/xfstests/xfstests/0001-add-missing-FTW_-macros-when-not-available-in-libc.patch new file mode 100644 index 0000000000..5e230e2cfb --- /dev/null +++ b/meta-filesystems/recipes-utils/xfstests/xfstests/0001-add-missing-FTW_-macros-when-not-available-in-libc.patch @@ -0,0 +1,41 @@ +From 5facddc332c5ff8330f93c0a7e1b7f6d7bbd24a3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 5 Nov 2023 08:31:21 -0800 +Subject: [PATCH] add missing FTW_ macros when not available in libc + +Fixes build with musl + +| xfsfind.c:176:13: error: use of undeclared identifier 'FTW_STOP' +| 176 | retval = FTW_STOP; +| | ^ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/global.h | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/global.h b/src/global.h +index 49570ef1..1c247488 100644 +--- a/src/global.h ++++ b/src/global.h +@@ -190,4 +190,16 @@ roundup_64(unsigned long long x, unsigned int y) + return rounddown_64(x + y - 1, y); + } + ++#ifndef FTW_ACTIONRETVAL ++#define FTW_ACTIONRETVAL 16 ++#endif ++ ++#ifndef FTW_CONTINUE ++#define FTW_CONTINUE 0 ++#endif ++ ++#ifndef FTW_STOP ++#define FTW_STOP 1 ++#endif ++ + #endif /* GLOBAL_H */ +-- +2.42.1 + diff --git a/meta-filesystems/recipes-utils/xfstests/xfstests_2023.10.29.bb b/meta-filesystems/recipes-utils/xfstests/xfstests_2023.10.29.bb index b8880e016c..4e8e318409 100644 --- a/meta-filesystems/recipes-utils/xfstests/xfstests_2023.10.29.bb +++ b/meta-filesystems/recipes-utils/xfstests/xfstests_2023.10.29.bb @@ -9,6 +9,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git;branch=for-next; git://github.com/amir73il/unionmount-testsuite.git;branch=master;protocol=https;name=unionmount;destsuffix=unionmount-testsuite \ file://0001-ltp-fsx.h-Explicitly-use-int-for-return-type-for-aio.patch \ file://0002-Drop-detached_mounts_propagation-and-remove-sys-moun.patch \ + file://0001-add-missing-FTW_-macros-when-not-available-in-libc.patch \ " SRCREV_xfstests = "f7765774a1b5cb98c2f21a892e82b3421f40e791" |