diff options
Diffstat (limited to 'source/n/net-tools/net-tools.SlackBuild')
| -rwxr-xr-x | source/n/net-tools/net-tools.SlackBuild | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/source/n/net-tools/net-tools.SlackBuild b/source/n/net-tools/net-tools.SlackBuild index e757722aa..5f11755d0 100755 --- a/source/n/net-tools/net-tools.SlackBuild +++ b/source/n/net-tools/net-tools.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,9 +23,17 @@ PKGNAM=net-tools VERSION=${VERSION:-1.60} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} +# 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} @@ -41,6 +49,8 @@ elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" fi cd $TMP @@ -54,8 +64,11 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/net-tools_1.60-19.diff.gz | patch -p1 --backup --verbose || exit -zcat $CWD/net-tools.diff.gz | patch -p1 --backup --verbose || exit +zcat $CWD/net-tools_1.60-23.diff.gz | patch -p1 --backup --verbose || exit 1 +zcat $CWD/net-tools.diff.gz | patch -p1 --backup --verbose || exit 1 +zcat $CWD/net-tools.struct.x25_address.gcc4.diff.gz | patch -p1 --backup --verbose || exit 1 +zcat $CWD/net-tools.switch.default.gcc4.diff.gz | patch -p1 --backup --verbose || exit 1 +zcat $CWD/net-tools.mii-tool.string.diff.gz | patch -p1 --backup --verbose || exit 1 mkdir -p $PKG/usr/doc/net-tools-1.60 cp -a README README.ipv6 $PKG/usr/doc/net-tools-1.60 |