diff options
| -rw-r--r-- | academic/octave/README | 2 | ||||
| -rw-r--r-- | academic/octave/doinst.sh | 6 | ||||
| -rw-r--r-- | academic/octave/octave.SlackBuild | 32 | ||||
| -rw-r--r-- | academic/octave/octave.info | 6 |
4 files changed, 31 insertions, 15 deletions
diff --git a/academic/octave/README b/academic/octave/README index 180066d9139b7..91420d137dd4e 100644 --- a/academic/octave/README +++ b/academic/octave/README @@ -4,4 +4,4 @@ linear and nonlinear problems numerically, and for performing other numerical experiments using a language that is mostly compatible with Matlab. It may also be used as a batch-oriented language. -FFTW is an optional dependency; it will be used if it is found. +FFTW and HDF5 are optional dependencies; they will be used if found. diff --git a/academic/octave/doinst.sh b/academic/octave/doinst.sh new file mode 100644 index 0000000000000..12009358229b8 --- /dev/null +++ b/academic/octave/doinst.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + diff --git a/academic/octave/octave.SlackBuild b/academic/octave/octave.SlackBuild index a82e79210995f..dd9a0d7ecc66e 100644 --- a/academic/octave/octave.SlackBuild +++ b/academic/octave/octave.SlackBuild @@ -2,16 +2,17 @@ # Slackware build script for octave # Written by Kyle Guinn <elyk03@gmail.com> +# HDF5 support by Aleksandar Samardzic <asamardzic@matf.bg.ac.yu> -PRGNAM=octave -VERSION=3.0.0 +PRGNAM="octave" +VERSION="3.0.1" ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} CWD=$(pwd) TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PRGNAM-$VERSION OUTPUT=${OUTPUT:-/tmp} DOCS="BUGS COPYING ChangeLog* INSTALL* NEWS* PROJECTS README* ROADMAP SENDING-PATCHES THANKS" @@ -20,6 +21,8 @@ if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" fi set -e @@ -31,8 +34,11 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . -chmod -R u+w,go+r-w,a-s . +chmod -R u+w,go+r-w,a-st . +# The HDF5 API changed between versions 1.6.x and 1.8.x. Octave +# currently uses the 1.6.x API, so a compatibility flag is necessary. +CPPFLAGS="-DH5_USE_16_API" \ CFLAGS="$SLKCFLAGS -fno-strict-aliasing" \ CXXFLAGS="$SLKCFLAGS -fno-strict-aliasing" \ FFLAGS="$SLKCFLAGS" \ @@ -46,20 +52,23 @@ FFLAGS="$SLKCFLAGS" \ --enable-shared \ --disable-static \ --enable-picky-flags \ - --build=i486-slackware-linux # leave this alone + --build=$ARCH-slackware-linux make -make install-strip DESTDIR=$PKG +make install DESTDIR=$PKG -# make install-strip doesn't yet strip the libraries... ( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : \ + | xargs strip --strip-unneeded 2> /dev/null || true + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : \ + | xargs strip --strip-unneeded 2> /dev/null || true ) ( cd $PKG/usr/man find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done + for i in $(find . -type l); do \ + ln -s $(readlink $i).gz $i.gz; rm $i; \ + done ) rm -f $PKG/usr/info/dir @@ -71,6 +80,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz diff --git a/academic/octave/octave.info b/academic/octave/octave.info index 5a78ba3d773c2..fc4e85408f49b 100644 --- a/academic/octave/octave.info +++ b/academic/octave/octave.info @@ -1,8 +1,8 @@ PRGNAM="octave" -VERSION="3.0.0" +VERSION="3.0.1" HOMEPAGE="http://www.gnu.org/software/octave/" -DOWNLOAD="ftp://ftp.octave.org/pub/octave/octave-3.0.0.tar.bz2" -MD5SUM="d5512acdf60ac04398ff258cbc37f3c4" +DOWNLOAD="ftp://ftp.octave.org/pub/octave/octave-3.0.1.tar.bz2" +MD5SUM="230f3895a42386ec625bf2593a44c441" MAINTAINER="Kyle Guinn" EMAIL="elyk03@gmail.com" APPROVED="rworkman" |