diff options
| author | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2024-05-16 00:22:35 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2024-05-16 13:45:48 +0700 |
| commit | eea0966fce1736067e9a1a830010c3cfe77d2c39 (patch) | |
| tree | b958cc7d3675bb0e21836d917bca4ebe257ba1ee /system | |
| parent | ffbc2448c00c75a3b3003a949749db29b4eb1aac (diff) | |
system/stressapptest: Fix build on i586.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system')
| -rw-r--r-- | system/stressapptest/stressapptest.SlackBuild | 10 | ||||
| -rw-r--r-- | system/stressapptest/support_i586.diff | 23 |
2 files changed, 13 insertions, 20 deletions
diff --git a/system/stressapptest/stressapptest.SlackBuild b/system/stressapptest/stressapptest.SlackBuild index 24ef170a42ea..ce0e6848bcdb 100644 --- a/system/stressapptest/stressapptest.SlackBuild +++ b/system/stressapptest/stressapptest.SlackBuild @@ -58,14 +58,8 @@ chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ -# This patch is based on Debian's support_i586_builds for -# stressapptest-1.0.6. Extra logic here to avoid running autoreconf if -# we don't need to (since it's slow). Allow PATCH=yes in the env for my -# own testing purposes. -if [ "${PATCH:-no}" = "yes" ]; then - patch -p1 < $CWD/support_i586.diff - autoreconf -if -fi +patch -p1 < $CWD/support_i586.diff +autoreconf -if CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/system/stressapptest/support_i586.diff b/system/stressapptest/support_i586.diff index ca9d1302cd13..18826c80760b 100644 --- a/system/stressapptest/support_i586.diff +++ b/system/stressapptest/support_i586.diff @@ -1,23 +1,22 @@ -diff -Naur stressapptest-1.0.9/configure.ac stressapptest-1.0.9.patched/configure.ac ---- stressapptest-1.0.9/configure.ac 2018-08-09 20:01:24.000000000 -0400 -+++ stressapptest-1.0.9.patched/configure.ac 2020-06-06 13:34:23.000966542 -0400 -@@ -19,6 +19,10 @@ +--- stressapptest-1.0.11/configure.ac.orig 2024-05-16 06:24:36.806255976 +0700 ++++ stressapptest-1.0.11/configure.ac 2024-05-16 06:25:18.914725236 +0700 +@@ -26,6 +26,10 @@ AC_DEFINE([STRESSAPPTEST_CPU_X86_64],[], [Defined if the target CPU is x86_64]) - ], + ], + [*i586*], [ -+ AC_DEFINE([STRESSAPPTEST_CPU_I686],[], ++ AC_DEFINE([STRESSAPPTEST_CPU_I586],[], + [Defined if the target CPU is i586]) -+ ], ++ ], [*i686*], [ AC_DEFINE([STRESSAPPTEST_CPU_I686],[], [Defined if the target CPU is i686]) -@@ -35,7 +39,7 @@ - AC_DEFINE([STRESSAPPTEST_CPU_AARCH64],[], - [Defined if the target CPU is aarch64]) +@@ -50,7 +54,7 @@ + AC_DEFINE([STRESSAPPTEST_CPU_LOONGARCH],[], + [Defined if the target CPU is LOONGARCH]) ], --[AC_MSG_WARN([Unsupported CPU: $host_cpu! Try x86_64, i686, powerpc, armv7a, or aarch64])] -+[AC_MSG_WARN([Unsupported CPU: $host_cpu! Try x86_64, i586, i686, powerpc, armv7a, or aarch64])] +-[AC_MSG_WARN([Unsupported CPU: $host_cpu! Try x86_64, i686, mips, powerpc, armv7a, aarch64 or loongarch])] ++[AC_MSG_WARN([Unsupported CPU: $host_cpu! Try x86_64, i586, i686, mips, powerpc, armv7a, aarch64 or loongarch])] ) ## The following allows like systems to share settings. This is not meant to |