aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2022-03-20 16:28:21 -0400
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-03-26 01:20:08 +0700
commitd38b127c1abd24d7f139c847916d81f80dddc89a (patch)
treed209b41f2e12432e6adafbe4156c01e26c284d70
parent17bbcb448095ed10f47232129a1977b9e370548d (diff)
network/slurm: Fix 32-bit build.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--network/slurm/README3
-rw-r--r--network/slurm/slurm.SlackBuild22
2 files changed, 17 insertions, 8 deletions
diff --git a/network/slurm/README b/network/slurm/README
index d12ef6cdeb69a..df2c788c60591 100644
--- a/network/slurm/README
+++ b/network/slurm/README
@@ -22,3 +22,6 @@ Optional dependencies:
HWLOC=yes|no (default: no), requires hwloc
RRDTOOL=yes|no (default: no), requires rrdtool
NUMA auto-detected, requires numactl
+
+Warning for 32-bit users: according to slurm's developers: 32-bit
+support is deprecated, and not tested regularly. Use at your own risk.
diff --git a/network/slurm/slurm.SlackBuild b/network/slurm/slurm.SlackBuild
index 911f09d6ad58a..f4817d6bae3fb 100644
--- a/network/slurm/slurm.SlackBuild
+++ b/network/slurm/slurm.SlackBuild
@@ -22,15 +22,19 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20220320 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - fix 32-bit build.
+# - do not install useless INSTALL in doc dir.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=slurm
VERSION=${VERSION:-20.11.4}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
-DOCS="AUTHORS COPYING DISCLAIMER INSTALL LICENSE.OpenSSL \
+DOCS="AUTHORS COPYING DISCLAIMER LICENSE.OpenSSL \
META NEWS README.rst RELEASE_NOTES"
if [ -z "$ARCH" ]; then
@@ -41,9 +45,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -53,12 +54,16 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
+# 20220320 bkw: 32-bit is deprecated but may still work.
+DEPRECATED=""
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
+ DEPRECATED="--enable-deprecated"
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
LIBDIRSUFFIX=""
+ DEPRECATED="--enable-deprecated"
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
@@ -81,14 +86,14 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+ -o -perm 511 \) -exec chmod 755 {} \+ -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -100,6 +105,7 @@ CXXFLAGS="$SLKCFLAGS" \
--mandir=/usr/man \
--sysconfdir=/etc \
--enable-static=no \
+ $DEPRECATED \
$HWLOC_SUPPORT \
$RRDTOOL_SUPPORT \
--build=$ARCH-slackware-linux \