diff options
| author | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 00:58:51 -0400 |
|---|---|---|
| committer | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 00:58:51 -0400 |
| commit | 202d0a78a50a0bdd997cd96765164dea16d76180 (patch) | |
| tree | 608ebfa091e1e811cc9497fd40ef1d272aff84ac | |
| parent | 367f8e12a0c531327568d9ef1527a3f9e22cd7ed (diff) | |
| download | slackbuilds-202d0a78a50a0bdd997cd96765164dea16d76180.tar.gz | |
academic/R: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
| -rw-r--r-- | academic/R/R.SlackBuild | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/academic/R/R.SlackBuild b/academic/R/R.SlackBuild index 67da9442ee..248c87efbc 100644 --- a/academic/R/R.SlackBuild +++ b/academic/R/R.SlackBuild @@ -6,10 +6,19 @@ PRGNAM=R VERSION=2.9.0 -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) ARCH=i486 ;; + arm*) ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -24,9 +33,6 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" fi set -e |