diff options
| author | Zach van Rijn <me@zv.io> | 2024-12-11 21:49:48 -0600 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2024-12-11 21:49:48 -0600 |
| commit | 785213ed2a7d5a66061bddaeb7a1ad4e86c3ed9a (patch) | |
| tree | 6d25eecddbe1b1f722ca584eef95e3ad42b6d6e2 | |
| parent | dd75bb185387a9f707fc994c0c4cfa2e5b1ad77a (diff) | |
| download | packages-785213ed2a7d5a66061bddaeb7a1ad4e86c3ed9a.tar.gz packages-785213ed2a7d5a66061bddaeb7a1ad4e86c3ed9a.tar.bz2 packages-785213ed2a7d5a66061bddaeb7a1ad4e86c3ed9a.tar.xz packages-785213ed2a7d5a66061bddaeb7a1ad4e86c3ed9a.zip | |
user/wimlib: avoid linux headers
| -rw-r--r-- | user/wimlib/APKBUILD | 2 | ||||
| -rw-r--r-- | user/wimlib/header.patch | 31 |
2 files changed, 24 insertions, 9 deletions
diff --git a/user/wimlib/APKBUILD b/user/wimlib/APKBUILD index 0246c8e36..a4e365ea6 100644 --- a/user/wimlib/APKBUILD +++ b/user/wimlib/APKBUILD @@ -36,5 +36,5 @@ package() { } sha512sums="f3c25ee14fe849f452f004ce8137ef040410ea048555ae71180086f010858b6ed593c8881b805bac65f9ee878bf11661a7f17677c6c24e2c77149c35ee0cd853 wimlib-1.14.4.tar.gz -811cf6db0df5efee974e4efe2f9322bef2aade2f101e3c202e2fa51dfc536663ad828e6fa037c490f8b603c8195285f44f0f9bab3220f217ac5a188e1e11d12f header.patch +25a410614b4d4a16f16149c09bb1107a5678d49b729ecb55fe5641727556f6eb8a0e3473331ae738e3747652674d78c32be0d6da57c2aa414bd9fc636c27997e header.patch e58429f3256e85e39558920be295c93645ec0584cf71282e01102c62b05b51fab1c3c1b62a8edb7be8bfc2427d2464400154ca05ad07e02548cad140f781aa7f pc-fuse3.patch" diff --git a/user/wimlib/header.patch b/user/wimlib/header.patch index cf6c32bc0..71255d446 100644 --- a/user/wimlib/header.patch +++ b/user/wimlib/header.patch @@ -1,14 +1,29 @@ -The RENAME_* flags are only exposed by <linux/fs.h> on musl systems. I have -not yet been able to triage whether this is something that should be fixed -musl-side or if this is an issue for upstream. +This patch should be removed once the following musl commit lands: ---- wimlib-1.14.4/src/mount_image.c.old 2023-07-22 18:55:59.000000000 -0500 -+++ wimlib-1.14.4/src/mount_image.c 2024-12-11 18:46:19.018387960 -0600 -@@ -52,6 +52,7 @@ - #include <sys/time.h> +https://git.musl-libc.org/cgit/musl/commit\ +/include/stdio.h?id=05ce67fea99ca09cd4b6625cff7aec9cc222dd5a + +These macros are also exposed via <linux/fs.h>. + +diff -ur a/src/mount_image.c b/src/mount_image.c +--- a/src/mount_image.c 2024-12-11 21:13:37.806412788 -0600 ++++ b/src/mount_image.c 2024-12-11 21:18:32.528640110 -0600 +@@ -53,6 +53,18 @@ #include <unistd.h> #include <utime.h> -+#include <linux/fs.h> ++#if defined(_GNU_SOURCE) ++#ifndef RENAME_NOREPLACE ++#define RENAME_NOREPLACE (1 << 0) ++#endif ++#ifndef RENAME_EXCHANGE ++#define RENAME_EXCHANGE (1 << 1) ++#endif ++#ifndef RENAME_WHITEOUT ++#define RENAME_WHITEOUT (1 << 2) ++#endif ++#endif ++ #include "wimlib/blob_table.h" #include "wimlib/dentry.h" + #include "wimlib/encoding.h" |