diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template index a4532bc4a93..f9d0f2c6771 100644 --- a/srcpkgs/cross-aarch64-linux-musl/template +++ b/srcpkgs/cross-aarch64-linux-musl/template @@ -11,7 +11,7 @@ _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} version=0.29 -revision=1 +revision=2 short_desc="Cross toolchain for ARM64 LE target (musl)" maintainer="Juan RP " homepage="https://www.voidlinux.org/" diff --git a/srcpkgs/kernel-libc-headers/patches/1-7-musl-aarch64-asm-ptrace.patch b/srcpkgs/kernel-libc-headers/patches/1-7-musl-aarch64-asm-ptrace.patch new file mode 100644 index 00000000000..970e342a97c --- /dev/null +++ b/srcpkgs/kernel-libc-headers/patches/1-7-musl-aarch64-asm-ptrace.patch @@ -0,0 +1,28 @@ +Work around redefinition of sigcontext in libc headers + +Introduced with: +https://github.com/torvalds/linux/commit/43d4da2c45b2f5d62f8a79ff7c6f95089bb24656 + +diff --git a/arch/arm64/include/uapi/asm/ptrace.h b/arch/arm64/include/uapi/asm/ptrace.h +index 98c4ce5..c44efed 100644 +--- arch/arm64/include/uapi/asm/ptrace.h ++++ arch/arm64/include/uapi/asm/ptrace.h +@@ -23,8 +23,6 @@ + #include + + #include +-#include +- + + /* + * PSR bits +@@ -64,8 +62,6 @@ + + #ifndef __ASSEMBLY__ + +-#include +- + /* + * User structures for general purpose, floating point and debug registers. + */ + diff --git a/srcpkgs/kernel-libc-headers/template b/srcpkgs/kernel-libc-headers/template index d0dabb6aa3f..19b5b839d9c 100644 --- a/srcpkgs/kernel-libc-headers/template +++ b/srcpkgs/kernel-libc-headers/template @@ -1,7 +1,7 @@ # Template file for 'kernel-libc-headers' pkgname=kernel-libc-headers version=4.19.0 -revision=1 +revision=2 bootstrap=yes nostrip=yes noverifyrdeps=yes