academic/grace: Miscellaneous cleanups.

This commit is contained in:
Robby Workman 2010-05-19 16:37:38 -05:00
parent ea40c41954
commit e8a63e8363
2 changed files with 14 additions and 2 deletions

View file

@ -10,4 +10,4 @@ calculations or perform automated tasks.
Grace is derived from Xmgr (a.k.a. ACE/gr), originally written by Paul Turner. Grace is derived from Xmgr (a.k.a. ACE/gr), originally written by Paul Turner.
This requires netcdf and fftw. This requires netcdf.

View file

@ -6,10 +6,19 @@
PRGNAM=grace PRGNAM=grace
VERSION=5.1.22 VERSION=5.1.22
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1} BUILD=${BUILD:-1}
TAG=${TAG:-"_SBo"} 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) CWD=$(pwd)
TMP=${TMP:-"/tmp/SBo"} TMP=${TMP:-"/tmp/SBo"}
PKG=$TMP/package-$PRGNAM PKG=$TMP/package-$PRGNAM
@ -24,6 +33,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC" SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64" LIBDIRSUFFIX="64"
else
SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
fi fi
set -e set -e