1 files changed, 16 insertions, 10 deletions
diff --git a/academic/suitesparse/suitesparse.SlackBuild b/academic/suitesparse/suitesparse.SlackBuild
index 27775d04d1..335456c32f 100644
--- a/academic/suitesparse/suitesparse.SlackBuild
+++ b/academic/suitesparse/suitesparse.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for suitesparse
 
-# Copyright 2017,2018 Christoph Willing,  Brisbane Australia
+# Copyright 2017-2019 Christoph Willing,  Brisbane Australia
 # All rights reserved.
 # Thanks to Pablo Santamaria for previous versions
 #
@@ -25,7 +25,7 @@
 
 PRGNAM=suitesparse
 SRCNAM=SuiteSparse
-VERSION=${VERSION:-5.3.0}
+VERSION=${VERSION:-5.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,8 +57,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-metis="" ; [ "${USEMETIS:-yes}" != "yes" ] && metis="CHOLMOD_CONFIG=-DNPARTITION"
-
 set -e
 
 rm -rf $PKG
@@ -78,17 +76,25 @@ mkdir -p $PKG/usr/include/suitesparse
 mkdir -p $PKG/usr/lib$LIBDIRSUFFIX
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 
+make
 make install \
-	MY_METIS_INC=/usr/include/metis MY_METIS_LIB=/usr/lib$LIBDIRSUFFIX/libmetis.so BLAS=-lblas \
-	$metis \
-	INSTALL_INCLUDE=$PKG/usr/include/suitesparse INSTALL_LIB=$PKG/usr/lib$LIBDIRSUFFIX \
-	INSTALL_DOC=$PKG/usr/doc/$PRGNAM-$VERSION
-chrpath --replace /usr/lib$LIBDIRSUFFIX $PKG/usr/lib$LIBDIRSUFFIX/*
+    INSTALL_INCLUDE=$PKG/usr/include/suitesparse \
+    INSTALL_LIB=$PKG/usr/lib$LIBDIRSUFFIX \
+    INSTALL_DOC=$PKG/usr/doc/$PRGNAM-$VERSION
+
+# Check that each library already has an rpath before attempting to modify it
+# (libmetis.so does not, causing `chrpath --replace` to fail)
+for l in $PKG/usr/lib${LIBDIRSUFFIX}/*
+do
+  if chrpath -l $l ; then
+    chrpath --replace /usr/lib$LIBDIRSUFFIX  $l
+  fi
+done
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-cp -a LICENSE.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.txt CONTRIBUTOR-LICENSE.txt README.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install