diff --git a/network/slurm/slurm.SlackBuild b/network/slurm/slurm.SlackBuild index b8d12937ad..94ff6ba9b7 100644 --- a/network/slurm/slurm.SlackBuild +++ b/network/slurm/slurm.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/sh # Slackware build script for Slurm @@ -32,7 +32,7 @@ DOCS="AUTHORS BUILD.NOTES COPYING DISCLAIMER INSTALL LICENSE.OpenSSL \ if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -43,8 +43,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -57,6 +57,8 @@ else LIBDIRSUFFIX="" fi +set -e + HWLOC=${HWLOC:-no} HWLOC_SUPPORT="" [ "$HWLOC" = "yes" ] && HWLOC_SUPPORT="--with-hwloc" @@ -65,8 +67,6 @@ RRDTOOL=${RRDTOOL:-no} RRDTOOL_SUPPORT="" [ "$RRDTOOL" = "yes" ] && RRDTOOL_SUPPORT="--with-rrdtool" -set -e - rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP