From 48c80af9ed84df25941adca85beb52dd0a3303e2 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 23 Oct 2019 19:02:05 +0200
Subject: [PATCH] stress-ng: fix build on musl (disable linux5.2 syscalls)

[ci skip]
---
 .../patches/disable-linux52-syscalls.patch    | 73 +++++++++++++++++++
 srcpkgs/stress-ng/template                    |  4 -
 2 files changed, 73 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch

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..caceb05f5e5
--- /dev/null
+++ b/srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch
@@ -0,0 +1,73 @@
+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
+@@ -1217,7 +1217,7 @@ int shim_pidfd_send_signal(
+  */
+ int shim_fsopen(const char *fsname, unsigned int flags)
+ {
+-#if defined(__NR_fsopen)
++#if 0
+ 	return syscall(__NR_fsopen, fsname, flags);
+ #else
+ 	return shim_enosys(0, fsname, flags);
+@@ -1226,7 +1226,7 @@ int shim_fsopen(const char *fsname, unsigned int flags)
+ 
+ int shim_fsmount(int fd, unsigned int flags, unsigned int ms_flags)
+ {
+-#if defined(__NR_fsmount)
++#if 0
+ 	return syscall(__NR_fsmount, fd, flags, ms_flags);
+ #else
+ 	return shim_enosys(0, fd, flags, ms_flags);
+@@ -1240,7 +1240,7 @@ int shim_fsconfig(
+ 	const void *value,
+ 	int aux)
+ {
+-#if defined(__NR_fsconfig)
++#if 0
+ 	return syscall(__NR_fsconfig, fd, cmd, key, value, aux);
+ #else
+ 	return shim_enosys(0, fd, cmd, key, value, aux);
+@@ -1254,7 +1254,7 @@ int shim_move_mount(
+ 	const char *to_pathname,
+ 	unsigned int flags)
+ {
+-#if defined(__NR_move_mount)
++#if 0
+         return syscall(__NR_move_mount, from_dfd, from_pathname,
+ 			to_dfd, to_pathname, flags);
+ #else
+--- stress-ramfs.c
++++ stress-ramfs.c
+@@ -170,10 +170,7 @@ static int stress_ramfs_child(const args_t *args)
+ 	do {
+ 		int rc;
+ 		char opt[32];
+-#if defined(__NR_fsopen) &&	\
+-    defined(__NR_fsmount) &&	\
+-    defined(__NR_fsconfig) &&	\
+-    defined(__NR_move_mount)
++#if 0
+ 		int fd, mfd;
+ #endif
+ 
+@@ -188,10 +185,7 @@ static int stress_ramfs_child(const args_t *args)
+ 		}
+ 		stress_ramfs_umount(args, realpathname);
+ 
+-#if defined(__NR_fsopen) &&	\
+-    defined(__NR_fsmount) &&	\
+-    defined(__NR_fsconfig) &&	\
+-    defined(__NR_move_mount)
++#if 0
+ 		/*
+ 		 *  Use the new Linux 5.2 mount system calls
+ 		 */
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