summaryrefslogtreecommitdiff
path: root/Ports/stress-ng/patches/0003-fix-always_inline.patch
diff options
context:
space:
mode:
authorBrian Gianforcaro <bgianf@serenityos.org>2021-12-28 00:04:46 -0800
committerAndreas Kling <kling@serenityos.org>2021-12-28 11:00:51 +0100
commitec21edb6020fb997e0332c91460ed368a79d2db3 (patch)
treec438c62119e31731a00f768f219977498cd14e94 /Ports/stress-ng/patches/0003-fix-always_inline.patch
parent904ea569566e220302800937edd352fa252fd4d3 (diff)
downloadserenity-ec21edb6020fb997e0332c91460ed368a79d2db3.zip
Ports: Update stress-ng port to 0.13.09
This change updates the port to the latest version, as part of that work I basically reported the application, as we have added a lot of LibC functionality which we were missing before. I've also updated the port to mark stressor's we don't support as nops, instead of trying to avoid compiling them at all. This will make the port much easier to maintain in the future.
Diffstat (limited to 'Ports/stress-ng/patches/0003-fix-always_inline.patch')
-rw-r--r--Ports/stress-ng/patches/0003-fix-always_inline.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/Ports/stress-ng/patches/0003-fix-always_inline.patch b/Ports/stress-ng/patches/0003-fix-always_inline.patch
new file mode 100644
index 0000000000..1d7a7ed58f
--- /dev/null
+++ b/Ports/stress-ng/patches/0003-fix-always_inline.patch
@@ -0,0 +1,29 @@
+From d28829e86cc1c8dff2c46fbeb3d4d1217fa4fd5c Mon Sep 17 00:00:00 2001
+From: Brian Gianforcaro <b.gianfo@gmail.com>
+Date: Mon, 27 Dec 2021 20:58:41 -0800
+Subject: [PATCH 03/14] serenity: Fix duplicate definition of ALWAYS_INLINE on
+ serenity
+
+---
+ stress-ng.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/stress-ng.h b/stress-ng.h
+index 73f549b..44f8bfa 100644
+--- a/stress-ng.h
++++ b/stress-ng.h
+@@ -1230,6 +1230,11 @@ typedef struct {
+ #define WEAK
+ #endif
+
++/* Serenity already defines this in sys/cdefs.h, just undefine it */
++#ifdef __serenity__
++ #undef ALWAYS_INLINE
++#endif
++
+ /* force inlining hint */
+ #if (defined(__GNUC__) && NEED_GNUC(3, 4, 0) \
+ && ((!defined(__s390__) && !defined(__s390x__)) || NEED_GNUC(6, 0, 1))) || \
+--
+2.32.0
+