From 3d5058b55462dee3ea59ff2385a3c029d30ef612 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Thu, 20 May 2010 12:41:09 -0500 Subject: desktop/xfce4-diskperf-plugin: Miscellaneous cleanups. --- .../xfce4-diskperf-plugin.SlackBuild | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/desktop/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SlackBuild b/desktop/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SlackBuild index ad0c2a4988..0b52e6e5a2 100644 --- a/desktop/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SlackBuild +++ b/desktop/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for xfce4-diskperf-plugin -# Copyright 2006-2009 Robby Workman, Northport, Alabama, USA +# Copyright 2006,2007,2008,2009,2010 Robby Workman, Northport, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,10 +24,19 @@ PRGNAM=xfce4-diskperf-plugin VERSION=2.2.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) 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 @@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e -- cgit v1.2.3