diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2024-05-01 02:35:39 +1100 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2024-05-01 02:38:11 +1100 |
| commit | e61a70fcbe1a8cd07355938471f01bf25e013b64 (patch) | |
| tree | 514f47829d440b63497acea00e5596c0338de255 | |
| parent | media-sound/schismtracker: Stabilize 20240328 x86, #930969 (diff) | |
| download | gentoo-e61a70fcbe1a8cd07355938471f01bf25e013b64.tar.gz gentoo-e61a70fcbe1a8cd07355938471f01bf25e013b64.tar.bz2 gentoo-e61a70fcbe1a8cd07355938471f01bf25e013b64.zip | |
sys-fs/mdadm: Add a first musl-1.2.5 build fix
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
| -rw-r--r-- | sys-fs/mdadm/files/mdadm-4.3-musl125-1.patch | 44 | ||||
| -rw-r--r-- | sys-fs/mdadm/mdadm-4.3.ebuild | 1 |
2 files changed, 45 insertions, 0 deletions
diff --git a/sys-fs/mdadm/files/mdadm-4.3-musl125-1.patch b/sys-fs/mdadm/files/mdadm-4.3-musl125-1.patch new file mode 100644 index 000000000000..a10b56b67b94 --- /dev/null +++ b/sys-fs/mdadm/files/mdadm-4.3-musl125-1.patch @@ -0,0 +1,44 @@ + +Note- This is also needed for musl-1.2.5 (aside other fixes)- dilfridge + +From 52bead95d2957437c691891fcdc49bd6afccdd49 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Date: Fri, 12 Apr 2024 18:45:13 +0200 +Subject: Create.c: fix uclibc build + +Define FALLOC_FL_ZERO_RANGE if needed as FALLOC_FL_ZERO_RANGE is only +defined for aarch64 on uclibc-ng resulting in the following or1k build +failure since commit 577fd10486d8d1472a6b559066f344ac30a3a391: + +Create.c: In function 'write_zeroes_fork': +Create.c:155:35: error: 'FALLOC_FL_ZERO_RANGE' undeclared (first use in this function) + 155 | if (fallocate(fd, FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE, + | ^~~~~~~~~~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/0e04bcdb591ca5642053e1f7e31384f06581e989 + +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com> +--- + Create.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Create.c b/Create.c +index 4397ff49..d94253b1 100644 +--- a/Create.c ++++ b/Create.c +@@ -32,6 +32,10 @@ + #include <sys/signalfd.h> + #include <sys/wait.h> + ++#ifndef FALLOC_FL_ZERO_RANGE ++#define FALLOC_FL_ZERO_RANGE 16 ++#endif ++ + static int round_size_and_verify(unsigned long long *size, int chunk) + { + if (*size == 0) +-- +cgit 1.2.3-korg + diff --git a/sys-fs/mdadm/mdadm-4.3.ebuild b/sys-fs/mdadm/mdadm-4.3.ebuild index 4e84a51e91b3..f132d354e746 100644 --- a/sys-fs/mdadm/mdadm-4.3.ebuild +++ b/sys-fs/mdadm/mdadm-4.3.ebuild @@ -36,6 +36,7 @@ PATCHES=( "${FILESDIR}/${PN}"-4.2-mdadm_env.patch #628968 "${FILESDIR}/${PN}"-4.3-ldflags.patch "${FILESDIR}/${PN}"-4.3-no-udev.patch + "${FILESDIR}/${PN}"-4.3-musl125-1.patch "${WORKDIR}/debian/patches/debian/0001-fix-manpages.patch" "${WORKDIR}/debian/patches/debian/0003-host-name-in-default-mailfrom.patch" "${WORKDIR}/debian/patches/debian/0004-exit-gracefully-when-md-device-not-found.patch" |