| 1 |
commit: 26182e7ab5f7af2be41774b98905855fe251b7bf |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 29 16:53:00 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 29 17:22:37 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26182e7a |
| 7 |
|
| 8 |
sys-fs/inotify-tools: fix build with musl |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/831976 |
| 11 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/inotify-tools-3.22.6.0-musl.patch | 26 ++++++++++++++++++++++ |
| 14 |
sys-fs/inotify-tools/inotify-tools-3.22.6.0.ebuild | 4 ++++ |
| 15 |
2 files changed, 30 insertions(+) |
| 16 |
|
| 17 |
diff --git a/sys-fs/inotify-tools/files/inotify-tools-3.22.6.0-musl.patch b/sys-fs/inotify-tools/files/inotify-tools-3.22.6.0-musl.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..435adc2e797a |
| 20 |
--- /dev/null |
| 21 |
+++ b/sys-fs/inotify-tools/files/inotify-tools-3.22.6.0-musl.patch |
| 22 |
@@ -0,0 +1,26 @@ |
| 23 |
+Former fix[1] for musl that got reverted[2] for possibly(?) wrong |
| 24 |
+reasons[3]. Should be harmless to include here until sorted out. |
| 25 |
+https://bugs.gentoo.org/831976 |
| 26 |
+ |
| 27 |
+[1] https://github.com/inotify-tools/inotify-tools/commit/b7889c8d |
| 28 |
+[2] https://github.com/inotify-tools/inotify-tools/commit/cbab7c0b |
| 29 |
+[3] https://github.com/inotify-tools/inotify-tools/issues/155 |
| 30 |
+From: Khem Raj <raj.khem@×××××.com> |
| 31 |
+Date: Mon, 3 Jan 2022 04:42:50 -0800 |
| 32 |
+Subject: [PATCH] libinotifytools: Bridge differences between musl/glibc/kernel |
| 33 |
+ fnotify.h (#154) |
| 34 |
+--- a/libinotifytools/src/inotifytools.c |
| 35 |
++++ b/libinotifytools/src/inotifytools.c |
| 36 |
+@@ -54,6 +54,12 @@ struct fanotify_event_fid { |
| 37 |
+ struct fanotify_event_info_fid info; |
| 38 |
+ struct file_handle handle; |
| 39 |
+ }; |
| 40 |
++ |
| 41 |
++#ifndef __GLIBC__ |
| 42 |
++#define val __val |
| 43 |
++#define __kernel_fsid_t fsid_t |
| 44 |
++#endif |
| 45 |
++ |
| 46 |
+ #endif |
| 47 |
+ |
| 48 |
+ /** |
| 49 |
|
| 50 |
diff --git a/sys-fs/inotify-tools/inotify-tools-3.22.6.0.ebuild b/sys-fs/inotify-tools/inotify-tools-3.22.6.0.ebuild |
| 51 |
index 2d25f84ae71b..6a270595ec4e 100644 |
| 52 |
--- a/sys-fs/inotify-tools/inotify-tools-3.22.6.0.ebuild |
| 53 |
+++ b/sys-fs/inotify-tools/inotify-tools-3.22.6.0.ebuild |
| 54 |
@@ -16,6 +16,10 @@ IUSE="doc" |
| 55 |
|
| 56 |
BDEPEND="doc? ( app-doc/doxygen )" |
| 57 |
|
| 58 |
+PATCHES=( |
| 59 |
+ "${FILESDIR}"/${P}-musl.patch |
| 60 |
+) |
| 61 |
+ |
| 62 |
src_prepare() { |
| 63 |
default |
Archives