diff options
| author | Kyle Guinn <elyk03@gmail.com> | 2016-11-19 14:27:57 -0600 |
|---|---|---|
| committer | David Spencer <idlemoor@slackbuilds.org> | 2016-12-04 19:28:56 +0000 |
| commit | 5d13a1088d61a8d7d6e2a8fa427aab4d4a19fb87 (patch) | |
| tree | 2f0db7282f5ea5bc057386a1a927c8dc8dfdb96b /academic/cholmod/cholmod.SlackBuild | |
| parent | 0fb73f83151790e1c32b5cc7ede451c409538975 (diff) | |
academic/cholmod: Updated for version 3.0.11.
Signed-off-by: Kyle Guinn <elyk03@gmail.com>
Diffstat (limited to 'academic/cholmod/cholmod.SlackBuild')
| -rw-r--r-- | academic/cholmod/cholmod.SlackBuild | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/academic/cholmod/cholmod.SlackBuild b/academic/cholmod/cholmod.SlackBuild index 9b04c77c052e3..b3f38eb486409 100644 --- a/academic/cholmod/cholmod.SlackBuild +++ b/academic/cholmod/cholmod.SlackBuild @@ -25,14 +25,14 @@ PRGNAM=cholmod SRCNAM=SuiteSparse SUBDIR=CHOLMOD -VERSION=${VERSION:-3.0.6} -SRCVER=${SRCVER:-4.4.6} +VERSION=${VERSION:-3.0.11} +SRCVER=${SRCVER:-4.5.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$(uname -m) ;; esac @@ -43,12 +43,14 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS="README.txt Doc/ChangeLog Core/lesser.txt Modify/gpl.txt" -MODULE_DOCS="Core/License.txt Check/License.txt Cholesky/License.txt Partition/License.txt MatrixOps/License.txt Modify/License.txt Supernodal/License.txt" +DOCS="README.txt Doc/ChangeLog Doc/License.txt Core/lesser.txt Modify/gpl.txt" if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" @@ -74,12 +76,13 @@ cd $SRCNAM/$SUBDIR chown -R root:root . chmod -R u+w,go-w,a+rX-st . -patch -p1 < $CWD/autotoolize.diff -patch -p1 < $CWD/atlas-threaded-blas.diff +patch -p1 < $CWD/patches/autotoolize.diff +patch -p2 < $CWD/patches/atlas-lib-rename.diff autoreconf -vif -CFLAGS="$SLKCFLAGS" \ -FFLAGS="$SLKCFLAGS" \ +# Avoid rebuilding the docs. +touch Doc/CHOLMOD_UserGuide.pdf + ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -91,7 +94,9 @@ FFLAGS="$SLKCFLAGS" \ --enable-shared \ --disable-static \ --disable-dependency-tracking \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux \ + CFLAGS="$SLKCFLAGS" \ + FFLAGS="$SLKCFLAGS" \ make make check @@ -101,9 +106,6 @@ find $PKG/usr/lib${LIBDIRSUFFIX} -name '*.la' -delete mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION -for i in $MODULE_DOCS; do - cp -a $i $PKG/usr/doc/$PRGNAM-$VERSION/$(echo $i | tr / _) -done cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install |