From 79c3ba35c3bd577f3a519c185a2297a15388c2ac Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 20 Jan 2021 11:44:24 +1000 Subject: [PATCH] stress_ng: bump version --- .../patches/stress_ng-0.12.01.patchset | 22 +++++++++++++++++++ ....12.00.recipe => stress_ng-0.12.01.recipe} | 7 ++++-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 app-benchmarks/stress-ng/patches/stress_ng-0.12.01.patchset rename app-benchmarks/stress-ng/{stress_ng-0.12.00.recipe => stress_ng-0.12.01.recipe} (92%) diff --git a/app-benchmarks/stress-ng/patches/stress_ng-0.12.01.patchset b/app-benchmarks/stress-ng/patches/stress_ng-0.12.01.patchset new file mode 100644 index 000000000..c1ee1c8ed --- /dev/null +++ b/app-benchmarks/stress-ng/patches/stress_ng-0.12.01.patchset @@ -0,0 +1,22 @@ +From 4f6b80ad397cacf8196e9ee2ddabad53dfeae5c0 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Wed, 20 Jan 2021 11:27:46 +1000 +Subject: Disable mlock for Haiku + + +diff --git a/stress-ng.h b/stress-ng.h +index a3e07e9..31c319f 100644 +--- a/stress-ng.h ++++ b/stress-ng.h +@@ -1200,7 +1200,7 @@ typedef struct { + #endif + + /* GCC mlocked data and data section attribute */ +-#if defined(__GNUC__) && NEED_GNUC(4,6,0) && !defined(__sun__) ++#if defined(__GNUC__) && NEED_GNUC(4,6,0) && !defined(__sun__) && !defined(__HAIKU__) + #define MLOCKED_DATA __attribute__((__section__("mlocked_data"))) + #define MLOCKED_TEXT __attribute__((__section__("mlocked_text"))) + #define MLOCKED_SECTION 1 +-- +2.30.0 + diff --git a/app-benchmarks/stress-ng/stress_ng-0.12.00.recipe b/app-benchmarks/stress-ng/stress_ng-0.12.01.recipe similarity index 92% rename from app-benchmarks/stress-ng/stress_ng-0.12.00.recipe rename to app-benchmarks/stress-ng/stress_ng-0.12.01.recipe index 00a05b1cb..fe36d9c09 100644 --- a/app-benchmarks/stress-ng/stress_ng-0.12.00.recipe +++ b/app-benchmarks/stress-ng/stress_ng-0.12.01.recipe @@ -36,12 +36,13 @@ LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://github.com/ColinIanKing/stress-ng/archive/V$portVersion.zip" SOURCE_DIR="stress-ng-$portVersion" -CHECKSUM_SHA256="53f85538ca0ca09c6f2f1ea0186f006537f93db4af35c0338f93e13b32eec0c6" +CHECKSUM_SHA256="17fff86fa6bc061802822bf4b076e511c577b51c114855ff679a38a11e6ca79e" +PATCHES="stress_ng-$portVersion.patchset" ARCHITECTURES="?x86_gcc2 x86_64" PROVIDES=" - stressng = $portVersion + stress_ng = $portVersion cmd:stress_ng = $portVersion " REQUIRES=" @@ -62,6 +63,8 @@ BUILD_PREREQUIRES=" BUILD() { + touch config + make -f Makefile.config make }