diff options
| author | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:14:28 -0400 |
|---|---|---|
| committer | David Somero <xgizzmo@slackbuilds.org> | 2010-06-04 01:14:28 -0400 |
| commit | 1d1dd2b10740dafab9014a83b2db7377113c0853 (patch) | |
| tree | e3fa4295b11dadcb2f2e81ca729998e40bb4bbfe | |
| parent | 32d6dca9c4fcc215f98e19bf057cd1a8c24ba959 (diff) | |
| download | slackbuilds-1d1dd2b10740dafab9014a83b2db7377113c0853.tar.gz | |
network/wireshark: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
| -rw-r--r-- | network/wireshark/wireshark.SlackBuild | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/network/wireshark/wireshark.SlackBuild b/network/wireshark/wireshark.SlackBuild index 28997d2297..68885f6777 100644 --- a/network/wireshark/wireshark.SlackBuild +++ b/network/wireshark/wireshark.SlackBuild @@ -27,10 +27,19 @@ PRGNAM=wireshark VERSION=${VERSION:-1.2.7} -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 @@ -45,6 +54,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e |