summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--academic/octave/README8
-rw-r--r--academic/octave/doinst.sh5
-rw-r--r--academic/octave/octave.SlackBuild27
-rw-r--r--academic/octave/octave.info6
-rw-r--r--academic/octave/patches/atlas-lib-rename.diff21
5 files changed, 47 insertions, 20 deletions
diff --git a/academic/octave/README b/academic/octave/README
index 2e9b9d91d6..4738a352f2 100644
--- a/academic/octave/README
+++ b/academic/octave/README
@@ -5,9 +5,9 @@ experiments using a language that is mostly compatible with Matlab. It may
also be used as a batch-oriented language.
This requires a BLAS/LAPACK implementation. Choose one of these package sets:
-* OpenBLAS (includes a LAPACK implementation)
-* atlas, lapack-atlas
-* blas, lapack (the Netlib reference implementations)
+ * OpenBLAS (includes both a BLAS and a LAPACK implementation)
+ * atlas (includes both a BLAS and a LAPACK implementation)
+ * blas, lapack (the Netlib reference implementations)
If more than one set is installed (assuming there are no packaging conflicts)
then the auto-detection will use the first implementation from this list that
it finds. If in doubt, choose the Netlib reference implementations; other
@@ -17,7 +17,7 @@ are not configured to detect/use alternate implementations.
These optional dependencies will be used if found (see INSTALL.OCTAVE, in the
Octave source, for a description of what each dependency offers):
amd, camd, colamd, ccolamd, cholmod, umfpack, cxsparse, glpk, arpack-ng,
-qrupdate, qhull, hdf5, fltk, ftgl, gl2ps, jdk, GraphicsMagick.
+qrupdate, qhull, hdf5, fltk, ftgl, gl2ps, jdk, GraphicsMagick, portaudio.
Octave can use ImageMagick (part of Slackware) or GraphicsMagick (available
from SBo) for some functionality. ImageMagick 6.8.6-10 from Slackware 14.1
diff --git a/academic/octave/doinst.sh b/academic/octave/doinst.sh
index 1f8ff67ded..abb2d260c7 100644
--- a/academic/octave/doinst.sh
+++ b/academic/octave/doinst.sh
@@ -8,3 +8,8 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
fi
fi
+if [ -x /usr/bin/install-info ]; then
+ chroot . /usr/bin/install-info --info-dir=/usr/info /usr/info/octave.info.gz 2> /dev/null
+ chroot . /usr/bin/install-info --info-dir=/usr/info /usr/info/liboctave.info.gz 2> /dev/null
+fi
+
diff --git a/academic/octave/octave.SlackBuild b/academic/octave/octave.SlackBuild
index 6599b217b3..cf56dd3de3 100644
--- a/academic/octave/octave.SlackBuild
+++ b/academic/octave/octave.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for octave
-# Copyright 2012-2015 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2012-2016 Kyle Guinn <elyk03@gmail.com>, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=octave
-VERSION=${VERSION:-4.0.0}
+VERSION=${VERSION:-4.2.0}
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
@@ -45,6 +45,9 @@ DOCS="AUTHORS BUGS CITATION COPYING ChangeLog INSTALL* NEWS README"
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=""
@@ -59,21 +62,20 @@ fi
# TODO: ImageMagick 6.8.6-10 from Slackware 14.1 is not compatible.
# Newer versions might work, so try offering that alternative again later.
-# umfpack.h includes amd.h, which may be installed outside of the standard
-# search dirs if you use the SBo packages. This ensures UMFPACK is found.
-WITH_AMD_INCLUDEDIR=${WITH_AMD_INCLUDEDIR:-/usr/include/amd}
-
set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.lz
cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go-w,a+rX-st .
+patch -p1 < $CWD/patches/atlas-lib-rename.diff
+autoreconf -vif
+
# Avoid rebuilding the documentation by making stamp-vti newer than its
# dependencies (in particular ./configure, which we may need to patch).
# If you live far enough east or west that the date contained in version.texi
@@ -84,9 +86,6 @@ chmod -R u+w,go-w,a+rX-st .
# targets in Octave 3.8.1. Maybe it works with a recent version of TeXLive?
find . -name stamp-vti -exec touch {} +
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-FFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -97,8 +96,10 @@ FFLAGS="$SLKCFLAGS" \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--disable-dependency-tracking \
--enable-strict-warning-flags \
- --with-amd-includedir=$WITH_AMD_INCLUDEDIR \
- --build=$ARCH-slackware-linux
+ --build=$ARCH-slackware-linux \
+ CFLAGS="$SLKCFLAGS" \
+ CXXFLAGS="$SLKCFLAGS" \
+ FFLAGS="$SLKCFLAGS" \
make
make check
diff --git a/academic/octave/octave.info b/academic/octave/octave.info
index d2c88dfcb7..57b40ce7df 100644
--- a/academic/octave/octave.info
+++ b/academic/octave/octave.info
@@ -1,8 +1,8 @@
PRGNAM="octave"
-VERSION="4.0.0"
+VERSION="4.2.0"
HOMEPAGE="https://www.gnu.org/software/octave/"
-DOWNLOAD="ftp://ftp.gnu.org/gnu/octave/octave-4.0.0.tar.xz"
-MD5SUM="f3de0a0d9758e112f13ce1f5eaf791bf"
+DOWNLOAD="ftp://ftp.gnu.org/gnu/octave/octave-4.2.0.tar.lz"
+MD5SUM="de47c55e39b55e8436a23fb176f45ee3"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="%README% blas lapack"
diff --git a/academic/octave/patches/atlas-lib-rename.diff b/academic/octave/patches/atlas-lib-rename.diff
new file mode 100644
index 0000000000..4801036f46
--- /dev/null
+++ b/academic/octave/patches/atlas-lib-rename.diff
@@ -0,0 +1,21 @@
+diff --git a/m4/ax_blas.m4 b/m4/ax_blas.m4
+--- a/m4/ax_blas.m4
++++ b/m4/ax_blas.m4
+@@ -116,13 +116,10 @@
+
+ # BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
+ if test $ax_blas_ok = no; then
+- AC_CHECK_LIB(atlas, ATL_xerbla,
+- [AC_CHECK_LIB(f77blas, $sgemm,
+- [AC_CHECK_LIB(cblas, cblas_dgemm,
+- [ax_blas_ok=yes
+- BLAS_LIBS="-lcblas -lf77blas -latlas"],
+- [], [-lf77blas -latlas])],
+- [], [-latlas])])
++ AC_CHECK_LIB(tatlas, $sgemm,
++ [ax_blas_ok=yes; BLAS_LIBS="-ltatlas"],
++ [AC_CHECK_LIB(satlas, $sgemm,
++ [ax_blas_ok=yes; BLAS_LIBS="-lsatlas"])])
+ fi
+
+ # BLAS in PhiPACK libraries? (requires generic BLAS lib, too)