diff --git a/srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch b/srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch new file mode 100644 index 00000000000..d6fab5f28db --- /dev/null +++ b/srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch @@ -0,0 +1,53 @@ +This disables usage of new Linux 5.2 system calls. + +This is necessary as musl has picked up the syscall numbers for these in its +most recent release, but our kernel-libc-headers is still 4.19, which breaks +build. + +Glibc is fine because it uses syscall numbers from these kernel headers +instead of defining its own. + +--- core-shim.c ++++ core-shim.c +@@ -24,6 +24,19 @@ + */ + #include "stress-ng.h" + ++#ifdef __NR_fsopen ++#undef __NR_fsopen ++#endif ++#ifdef __NR_fsmount ++#undef __NR_fsmount ++#endif ++#ifdef __NR_fsconfig ++#undef __NR_fsconfig ++#endif ++#ifdef __NR_move_mount ++#undef __NR_move_mount ++#endif ++ + /* + * Various shim abstraction wrappers around systems calls and + * GCC helper functions that may not be supported by some +--- stress-ramfs.c ++++ stress-ramfs.c +@@ -24,6 +24,19 @@ + */ + #include "stress-ng.h" + ++#ifdef __NR_fsopen ++#undef __NR_fsopen ++#endif ++#ifdef __NR_fsmount ++#undef __NR_fsmount ++#endif ++#ifdef __NR_fsconfig ++#undef __NR_fsconfig ++#endif ++#ifdef __NR_move_mount ++#undef __NR_move_mount ++#endif ++ + static const help_t help[] = { + { NULL, "ramfs N", "start N workers exercising ramfs mounts" }, + { NULL, "ramfs-ops N", "stop after N bogo ramfs mount operations" }, diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template index 29b3c9d65af..512b379be63 100644 --- a/srcpkgs/stress-ng/template +++ b/srcpkgs/stress-ng/template @@ -10,7 +10,3 @@ license="GPL-2.0-or-later" homepage="http://kernel.ubuntu.com/~cking/stress-ng/" distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz" checksum=4addeaabcfcb709581cbc4c61182317b8d91bcf31f529bfa899d170facfd75ce - -case "$XBPS_TARGET_MACHINE" in - *-musl) broken="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/21516/steps/shell_3/logs/stdio" -esac