From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] stress-ng: fix build on musl (disable linux5.2 syscalls)
Date: Wed, 23 Oct 2019 19:52:55 +0200 [thread overview]
Message-ID: <20191023175255.4n2eEYecYc8A92TUj1X7ja5kzxYF7Tj-qWjYutLi8mg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-15743@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 345 bytes --]
There is an updated pull request by q66 against master on the void-packages repository
https://github.com/void-ppc/void-packages stress-ng
https://github.com/void-linux/void-packages/pull/15743
stress-ng: fix build on musl (disable linux5.2 syscalls)
A patch file from https://github.com/void-linux/void-packages/pull/15743.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-stress-ng-15743.patch --]
[-- Type: text/x-diff, Size: 2627 bytes --]
From 74e004da45c16de8da655e7270365619d6ca9f19 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 | 53 +++++++++++++++++++
srcpkgs/stress-ng/template | 4 --
2 files changed, 53 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..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
next prev parent reply other threads:[~2019-10-23 17:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-23 17:04 [PR PATCH] " voidlinux-github
2019-10-23 17:21 ` voidlinux-github
2019-10-23 17:22 ` voidlinux-github
2019-10-23 17:52 ` voidlinux-github [this message]
2019-10-23 17:52 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-23 19:07 ` [PR PATCH] [Merged]: " voidlinux-github
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191023175255.4n2eEYecYc8A92TUj1X7ja5kzxYF7Tj-qWjYutLi8mg@z \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).