diff options
| author | Zheng Junjie <z572@z572.online> | 2025-06-25 11:56:03 +0800 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-07-18 20:17:37 +0200 |
| commit | c2e16dcec79887d1890cd0d33803bf55c96b1bc4 (patch) | |
| tree | 0b911cbaf4c77f6cb02a986592e336ac0329c464 /gnu | |
| parent | f9df228dbde7e9b85b13721d33054481d66f0488 (diff) | |
gnu: proot: Fix build.
* gnu/packages/patches/proot-add-missing-include.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/linux.scm (proot): Use it.
Change-Id: Ia160417b06073c29b9f540fc4883d1f74dfd6003
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/linux.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/proot-add-missing-include.patch | 15 |
3 files changed, 18 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 2edcab36721..e010822b17d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2124,6 +2124,7 @@ dist_patch_DATA = \ %D%/packages/patches/procmail-CVE-2017-16844.patch \ %D%/packages/patches/proj-7-initialize-memory.patch \ %D%/packages/patches/proot-add-clone3.patch \ + %D%/packages/patches/proot-add-missing-include.patch \ %D%/packages/patches/protobuf-fix-build-on-32bit.patch \ %D%/packages/patches/psm-arch.patch \ %D%/packages/patches/psm-disable-memory-stats.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bef3ea2fcce..ab6335a5a68 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -9272,7 +9272,8 @@ Text-based output formats: CSV, XML, Netfilter's LOG, Netfilter's conntrack (base32 "186qsg4yvisqjgf8w5jxhnlig7x341vpqwcgp8as3r59qmqkpmk7")) ;; Waiting for upstream inclusion at ;; https://github.com/proot-me/proot/pull/355 - (patches (search-patches "proot-add-clone3.patch")))) + (patches (search-patches "proot-add-clone3.patch" + "proot-add-missing-include.patch")))) (build-system gnu-build-system) ;; Many architectures are not supported (see: ;; https://github.com/proot-me/proot/blob/master/src/arch.h#L51). diff --git a/gnu/packages/patches/proot-add-missing-include.patch b/gnu/packages/patches/proot-add-missing-include.patch new file mode 100644 index 00000000000..209be3dd61a --- /dev/null +++ b/gnu/packages/patches/proot-add-missing-include.patch @@ -0,0 +1,15 @@ +Add missing include to avoid implicit function declaration, prohibited with +GCC 14. + +diff --git a/src/tracee/tracee.c b/src/tracee/tracee.c +index 9b16f6aa..39308c32 100644 +--- a/src/tracee/tracee.c ++++ b/src/tracee/tracee.c +@@ -44,6 +44,7 @@ + #include "cli/note.h" + + #include "compat.h" ++#include "mem.h" + + #ifndef __W_STOPCODE + #define __W_STOPCODE(sig) ((sig) <<8 | 0x7f) |