From 0dd240ca471db70d5962b802a7449052c7409a19 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 1 Oct 2022 22:46:55 +0200 Subject: [PATCH] stress-ng: update to 0.14.06. --- .../patches/disable-linux52-syscalls.patch | 53 ------------------- srcpkgs/stress-ng/patches/ppc32.patch | 20 ------- srcpkgs/stress-ng/template | 9 ++-- 3 files changed, 5 insertions(+), 77 deletions(-) delete mode 100644 srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch delete mode 100644 srcpkgs/stress-ng/patches/ppc32.patch diff --git a/srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch b/srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch deleted file mode 100644 index c452e1c899f..00000000000 --- a/srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch +++ /dev/null @@ -1,53 +0,0 @@ -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. - ---- a/core-shim.c -+++ b/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 ---- a/stress-ramfs.c -+++ b/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 stress_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/patches/ppc32.patch b/srcpkgs/stress-ng/patches/ppc32.patch deleted file mode 100644 index 6c38b5cca32..00000000000 --- a/srcpkgs/stress-ng/patches/ppc32.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit 142c4e0a4e9d85c5d32faf0479b086ee4381502b -Author: q66 -Date: Fri Sep 16 11:48:52 2022 +0000 - - fix build on ppc32 - - stress-regs.c:120:2: error: void value not ignored as it ought to be - -diff --git a/stress-regs.c b/stress-regs.c -index 1ba97a8..63bf3ed 100644 ---- a/stress-regs.c -+++ b/stress-regs.c -@@ -117,7 +117,6 @@ static void regs_check128( - do { \ - (void)args; \ - (void)reg; \ -- (void)expected; \ - (void)value; \ - } while (0) - #endif diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template index 91e29611011..f99b9d75d9e 100644 --- a/srcpkgs/stress-ng/template +++ b/srcpkgs/stress-ng/template @@ -1,7 +1,7 @@ # Template file for 'stress-ng' pkgname=stress-ng -version=0.14.05 -revision=3 +version=0.14.06 +revision=1 build_style=gnu-makefile make_use_env=1 short_desc="Load and stress a computer system" @@ -9,8 +9,9 @@ maintainer="Leah Neukirchen " license="GPL-2.0-or-later" homepage="https://github.com/ColinIanKing/stress-ng/" distfiles="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${version}.tar.gz" -checksum=2ee20333d306037cf44f4e8d038bc6253106dcb54f37ee548e9adfd94a6a391c +checksum=54f6c3f84b20efedafd3394ec168e53632a685cfdd76f24270653e898d9ede08 case "$XBPS_MACHINE" in - x86_64) nodebug=yes ;; + # stress-vecshuf.c:107:39: internal compiler error: in expand_debug_locations, at cfgexpand.c:5458 + x86_64) nodebug=yes;; esac