diff options
Diffstat (limited to 'academic/octave/octave.SlackBuild')
| -rw-r--r-- | academic/octave/octave.SlackBuild | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/academic/octave/octave.SlackBuild b/academic/octave/octave.SlackBuild index 162ebf162954d..71051d747a949 100644 --- a/academic/octave/octave.SlackBuild +++ b/academic/octave/octave.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=octave -VERSION=${VERSION:-6.4.0} +VERSION=${VERSION:-7.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -67,13 +67,17 @@ else fi # Use GraphicsMagick by default. Fall back on ImageMagick from the full -# Slackware install if it's not present. Requires a patch for this bug: -# https://savannah.gnu.org/bugs/?49653 +# Slackware install if it's not present. # # GraphicsMagick is default due to the fact that the Octave devs mainly test # with that, and went several releases before noticing ImageMagick was broken. # If ImageMagick doesn't work, install GraphicsMagick, or set MAGICK="". -MAGICK=${MAGICK-GraphicsMagick} +# +# TODO: ImageMagick may no longer be compatible. The --with-magick argument +# should be the name of a pkg-config file. Documentation suggests +# "ImageMagick++" which does not exist. "ImageMagick" and "Magick++" exist; +# the former does not pass configure checks, the latter fails at compile time. +MAGICK=${MAGICK-GraphicsMagick++} if [ -n "$MAGICK" ] && ! pkg-config --exists $MAGICK; then MAGICK=ImageMagick fi @@ -92,7 +96,7 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go-w,a+rX-st . -patch -p1 < $CWD/patches/imagemagick.diff # https://savannah.gnu.org/bugs/?49653 +patch -p1 < $CWD/patches/3c3abe6dbe58.diff # https://savannah.gnu.org/bugs/?62295 patch -p1 < $CWD/patches/atlas-lib-rename.diff autoreconf -vif @@ -101,21 +105,21 @@ autoreconf -vif # If you live far enough east or west that the date contained in version.texi # does not match that file's timestamp when printed accounting for your # timezone, then the docs get rebuilt with your local date. -# -# The TeX environment in Slackware 14.1 fails to build the DVI and PDF -# targets in Octave 3.8.1. Maybe it works with a recent version of TeXLive? find . -name stamp-vti -exec touch {} + +# TODO: Re-enable --with-openssl=auto in a future release once +# https://savannah.gnu.org/bugs/?62416 is fixed. + ./configure \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=\${prefix}/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ - --mandir=/usr/man \ - --infodir=/usr/info \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ + --mandir=\${prefix}/man \ + --infodir=\${prefix}/info \ + --docdir=\${prefix}/doc/$PRGNAM-$VERSION \ --disable-dependency-tracking \ - --with-openssl=auto \ + --with-linux-crypto \ ${MAGICK} \ --build=$ARCH-slackware-linux \ CFLAGS="$SLKCFLAGS" \ @@ -123,7 +127,8 @@ find . -name stamp-vti -exec touch {} + FFLAGS="$SLKCFLAGS" \ make -make check +# TODO: May fail if not all optional deps are installed (gl2ps in particular). +#make check make install-strip DESTDIR=$PKG find $PKG/usr/lib${LIBDIRSUFFIX} -name '*.la' -delete |