diff options
Diffstat (limited to 'academic/spqr/spqr.SlackBuild')
-rw-r--r-- | academic/spqr/spqr.SlackBuild | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/academic/spqr/spqr.SlackBuild b/academic/spqr/spqr.SlackBuild index 890cad7e91..aa9380fc4b 100644 --- a/academic/spqr/spqr.SlackBuild +++ b/academic/spqr/spqr.SlackBuild @@ -25,14 +25,14 @@ PRGNAM=spqr SRCNAM=SuiteSparse SUBDIR=SPQR -VERSION=${VERSION:-2.0.2} -SRCVER=${SRCVER:-4.4.6} +VERSION=${VERSION:-2.0.7} +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,11 +43,14 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS="README.txt Doc/ChangeLog Doc/gpl.txt" +DOCS="README.txt Doc/ChangeLog Doc/License.txt Doc/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="" @@ -73,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" \ -CXXFLAGS="$SLKCFLAGS" \ +# Avoid rebuilding the docs. +touch Doc/spqr_user_guide.pdf + ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -90,7 +94,9 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-shared \ --disable-static \ --disable-dependency-tracking \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux \ + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ make make check |