From c6c9d3b76d9dfb57adea26f2525c2f8c6e1a8967 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Sat, 22 May 2010 23:10:38 -0500 Subject: development/patchutils: Miscellaneous cleanups. --- development/patchutils/patchutils.SlackBuild | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'development/patchutils') diff --git a/development/patchutils/patchutils.SlackBuild b/development/patchutils/patchutils.SlackBuild index ef25e980f4..bcedd278ab 100644 --- a/development/patchutils/patchutils.SlackBuild +++ b/development/patchutils/patchutils.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for patchutils -# Copyright 2008-2009 Robby Workman, Northport, Alabama, USA +# Copyright 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=patchutils VERSION=0.3.1 -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" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e @@ -74,10 +86,7 @@ make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) +find $PKG/usr/man -type f -exec gzip -9 {} \; mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ -- cgit v1.2.3-80-g2a13