diff options
Diffstat (limited to 'academic/octave/octave.SlackBuild')
| -rw-r--r-- | academic/octave/octave.SlackBuild | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/academic/octave/octave.SlackBuild b/academic/octave/octave.SlackBuild index 9ed28fb1b2..68eded862f 100644 --- a/academic/octave/octave.SlackBuild +++ b/academic/octave/octave.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for octave -# Copyright 2012-2013 Kyle Guinn <elyk03@gmail.com>, USA +# Copyright 2012-2014 Kyle Guinn <elyk03@gmail.com>, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=octave -VERSION=${VERSION:-3.6.4} +VERSION=${VERSION:-3.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -40,7 +40,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS="AUTHORS BUGS COPYING ChangeLog INSTALL* NEWS README" +DOCS="AUTHORS BUGS CITATION COPYING ChangeLog INSTALL* NEWS README" if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -56,16 +56,8 @@ else LIBDIRSUFFIX="" fi -# Default to use ImageMagick (shipped with Slackware) instead of -# GraphicsMagick so that octave will have at least some sort of image -# reading capabilities. It's unclear if one is recommended over the other. -# -# ImageMagick uses 16 bits per pixel quantum (each of the red, green, blue, -# and alpha components) by default; GraphicsMagick uses 8 bits by default. -# If you require more, add '--with-quantum-depth=N' (where N is 8, 16, or 32) -# to the ./configure step of either Magick package when you build it. -# Larger values will make your Magick package slower and use more memory. -WITH_MAGICK=${WITH_MAGICK:-ImageMagick} # alternatively, "GraphicsMagick" +# 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. @@ -86,6 +78,15 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Allow Octave to find compressed info files. +# https://savannah.gnu.org/bugs/?41054 +patch -p1 < $CWD/patches/compressed-info.diff + +# Fix several configure checks due to the above umfpack.h -> amd.h issue. +# https://savannah.gnu.org/bugs/?41209 +patch -p1 < $CWD/patches/umfpack-cppflags.diff +autoreconf -vif + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ FFLAGS="$SLKCFLAGS" \ @@ -97,10 +98,8 @@ FFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --infodir=/usr/info \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-shared \ - --disable-static \ + --disable-dependency-tracking \ --enable-strict-warning-flags \ - --with-magick=$WITH_MAGICK \ --with-amd-includedir=$WITH_AMD_INCLUDEDIR \ --build=$ARCH-slackware-linux |