system/oss: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
This commit is contained in:
parent
06be7c3115
commit
21fad33106
|
@ -7,13 +7,22 @@
|
||||||
PRGNAM=oss
|
PRGNAM=oss
|
||||||
VERSION=${VERSION:-4.2}
|
VERSION=${VERSION:-4.2}
|
||||||
SUBVERSION=${SUBVERSION:-2002}
|
SUBVERSION=${SUBVERSION:-2002}
|
||||||
ARCH=${ARCH:-i486}
|
|
||||||
BUILD=${BUILD:-1}
|
BUILD=${BUILD:-1}
|
||||||
TAG=${TAG:-_SBo}
|
TAG=${TAG:-_SBo}
|
||||||
|
|
||||||
SRCVERSION=v${VERSION}-build${SUBVERSION}-src-gpl
|
SRCVERSION=v${VERSION}-build${SUBVERSION}-src-gpl
|
||||||
PKGVERSION=${VERSION}.${SUBVERSION}
|
PKGVERSION=${VERSION}.${SUBVERSION}
|
||||||
|
|
||||||
|
# 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)
|
CWD=$(pwd)
|
||||||
TMP=${TMP:-/tmp/SBo}
|
TMP=${TMP:-/tmp/SBo}
|
||||||
PKG=$TMP/package-$PRGNAM
|
PKG=$TMP/package-$PRGNAM
|
||||||
|
@ -28,6 +37,9 @@ elif [ "$ARCH" = "i686" ]; then
|
||||||
elif [ "$ARCH" = "x86_64" ]; then
|
elif [ "$ARCH" = "x86_64" ]; then
|
||||||
SLKCFLAGS="-O2" # yes, -fPIC is left out on purpose here
|
SLKCFLAGS="-O2" # yes, -fPIC is left out on purpose here
|
||||||
LIBDIRSUFFIX="64"
|
LIBDIRSUFFIX="64"
|
||||||
|
else
|
||||||
|
SLKCFLAGS="-O2"
|
||||||
|
LIBDIRSUFFIX=""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
set -e # Exit on most errors
|
set -e # Exit on most errors
|
||||||
|
|
Loading…
Reference in New Issue