summaryrefslogtreecommitdiff
path: root/academic/octave/octave.SlackBuild
diff options
context:
space:
mode:
authorKyle Guinn <elyk03@gmail.com>2016-11-19 21:03:41 -0600
committerDavid Spencer <idlemoor@slackbuilds.org>2016-12-04 19:28:56 +0000
commit5cf028d0cdadd500d208f227368ad32d29aecfdb (patch)
tree86e1b2387bc4ff8cd254066492ddaa849a933bb7 /academic/octave/octave.SlackBuild
parentb3fc4f20273269574c61ee455886c9437ca26734 (diff)
downloadslackbuilds-5cf028d0cdadd500d208f227368ad32d29aecfdb.tar.gz
academic/octave: Updated for version 4.2.0.
Signed-off-by: Kyle Guinn <elyk03@gmail.com>
Diffstat (limited to 'academic/octave/octave.SlackBuild')
-rw-r--r--academic/octave/octave.SlackBuild27
1 files changed, 14 insertions, 13 deletions
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