diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2010-05-19 16:37:38 -0500 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2010-05-21 01:29:30 -0500 |
| commit | e8a63e8363f2c9dc296a903744154a9eeab8136c (patch) | |
| tree | 01c669b84ff7bf75b7f027a3c1b527dbedaace8c | |
| parent | ea40c4195435b74a71d553242ac399c44339c6b2 (diff) | |
| download | slackbuilds-e8a63e8363f2c9dc296a903744154a9eeab8136c.tar.gz | |
academic/grace: Miscellaneous cleanups.
| -rw-r--r-- | academic/grace/README | 2 | ||||
| -rw-r--r-- | academic/grace/grace.SlackBuild | 14 |
2 files changed, 14 insertions, 2 deletions
diff --git a/academic/grace/README b/academic/grace/README index ef2bf3c930..11a339c077 100644 --- a/academic/grace/README +++ b/academic/grace/README @@ -10,4 +10,4 @@ calculations or perform automated tasks. Grace is derived from Xmgr (a.k.a. ACE/gr), originally written by Paul Turner. -This requires netcdf and fftw. +This requires netcdf. diff --git a/academic/grace/grace.SlackBuild b/academic/grace/grace.SlackBuild index 65c6d8c12d..bbe4c74fdb 100644 --- a/academic/grace/grace.SlackBuild +++ b/academic/grace/grace.SlackBuild @@ -6,10 +6,19 @@ PRGNAM=grace VERSION=5.1.22 -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 |