summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2024-03-30 15:47:13 -0400
committerMike Gilbert <floppym@gentoo.org>2024-03-30 15:48:29 -0400
commitc4fd998c1d4b8f626d97b1b3782b5a25adde90c5 (patch)
tree9abecc525ebcc4c38084906d2ac325c2c87e92ea /sys-fs/mdadm
parentpackage.mask: Last rite dev-python/nspektr (diff)
downloadgentoo-c4fd998c1d4b8f626d97b1b3782b5a25adde90c5.tar.gz
gentoo-c4fd998c1d4b8f626d97b1b3782b5a25adde90c5.tar.bz2
gentoo-c4fd998c1d4b8f626d97b1b3782b5a25adde90c5.zip
sys-fs/mdadm: fix build with USE=-udev
Closes: https://bugs.gentoo.org/928228 Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'sys-fs/mdadm')
-rw-r--r--sys-fs/mdadm/files/mdadm-4.3-no-udev.patch31
-rw-r--r--sys-fs/mdadm/mdadm-4.3.ebuild1
2 files changed, 32 insertions, 0 deletions
diff --git a/sys-fs/mdadm/files/mdadm-4.3-no-udev.patch b/sys-fs/mdadm/files/mdadm-4.3-no-udev.patch
new file mode 100644
index 000000000000..dd7ef696acfb
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-4.3-no-udev.patch
@@ -0,0 +1,31 @@
+https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/patch/?id=1750758c7ff526e3560433f6235e5cfa35cf646a
+https://bugs.gentoo.org/928228
+
+From 1750758c7ff526e3560433f6235e5cfa35cf646a Mon Sep 17 00:00:00 2001
+From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
+Date: Wed, 6 Mar 2024 15:50:55 +0100
+Subject: udev.c: Do not require libudev.h if DNO_LIBUDEV
+
+libudev may not be presented at all, do not require it.
+
+Reported-by: Boian Bonev <bbonev@ipacct.com>
+Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
+---
+ udev.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/udev.c b/udev.c
+index bc4722b0..066e6ab1 100644
+--- a/udev.c
++++ b/udev.c
+@@ -26,7 +26,10 @@
+ #include <signal.h>
+ #include <limits.h>
+ #include <syslog.h>
++
++#ifndef NO_LIBUDEV
+ #include <libudev.h>
++#endif
+
+ static char *unblock_path;
+
diff --git a/sys-fs/mdadm/mdadm-4.3.ebuild b/sys-fs/mdadm/mdadm-4.3.ebuild
index c78553aa7558..4e84a51e91b3 100644
--- a/sys-fs/mdadm/mdadm-4.3.ebuild
+++ b/sys-fs/mdadm/mdadm-4.3.ebuild
@@ -35,6 +35,7 @@ PATCHES=(
"${FILESDIR}/${PN}"-4.3-in_initrd-collision.patch #830461
"${FILESDIR}/${PN}"-4.2-mdadm_env.patch #628968
"${FILESDIR}/${PN}"-4.3-ldflags.patch
+ "${FILESDIR}/${PN}"-4.3-no-udev.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"