diff options
| -rw-r--r-- | academic/gwyddion/README | 2 | ||||
| -rw-r--r-- | academic/gwyddion/gwyddion.SlackBuild | 20 |
2 files changed, 15 insertions, 7 deletions
diff --git a/academic/gwyddion/README b/academic/gwyddion/README index 34e3c74f5e..22cc251315 100644 --- a/academic/gwyddion/README +++ b/academic/gwyddion/README @@ -4,4 +4,4 @@ height fields obtained by means of scanning probe microscopy techniques (AFM, MFM, STM, SNOM/NSOM), however it can be generally used for any other height field and image analysis -This requires fftw and gtkglext. +This requires gtkglext. diff --git a/academic/gwyddion/gwyddion.SlackBuild b/academic/gwyddion/gwyddion.SlackBuild index 7d54ba3f91..c949ae7b6f 100644 --- a/academic/gwyddion/gwyddion.SlackBuild +++ b/academic/gwyddion/gwyddion.SlackBuild @@ -6,10 +6,19 @@ PRGNAM=gwyddion VERSION=${VERSION:-2.19} -ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -24,6 +33,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e @@ -59,10 +71,7 @@ make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "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 -) +find $PKG/usr/man -type f -exec gzip -9 {} \; mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION @@ -72,5 +81,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG - /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} |