diff options
| author |   Eric Hameleers <alien@slackware.com> | 2009-05-12 20:24:31 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2009-05-12 20:24:31 +0000 |
| commit | e603c15af1026f8488e114a222ea8a15e9465e6b (patch) | |
| tree | 59d705560e079bf266fe6b68fd656a92d54d1d24 /yasm | |
| parent | 896ebd4dd9eca587842768956222a27a614b0059 (diff) | |
| download | asb-e603c15af1026f8488e114a222ea8a15e9465e6b.tar.gz asb-e603c15af1026f8488e114a222ea8a15e9465e6b.tar.xz | |
Updated to 0.8.0
Diffstat (limited to 'yasm')
| -rwxr-xr-x | yasm/build/yasm.SlackBuild | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/yasm/build/yasm.SlackBuild b/yasm/build/yasm.SlackBuild index d63167bf..a85349cf 100755 --- a/yasm/build/yasm.SlackBuild +++ b/yasm/build/yasm.SlackBuild @@ -34,15 +34,17 @@ # * Initial build. # 0.7.2-1: 08/dec/2008 by Eric Hameleers <alien@slackware.com> # * Update. +# 0.8.0-1: 12/may/2009 by Eric Hameleers <alien@slackware.com> +# * Update. # -# Run 'sh yasm.SlackBuild --cleanup' to build a Slackware package. +# Run 'sh yasm.SlackBuild' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . # Install using 'installpkg'. # # ----------------------------------------------------------------------------- PRGNAM=yasm -VERSION=${VERSION:-0.7.2} +VERSION=${VERSION:-0.8.0} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-alien} @@ -75,15 +77,8 @@ trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR set -u P1=${1:-1} -# Slackware 11 and up need other option (gcc > 3.3.x) -if [ $(gcc -dumpversion | tr -d '.' |cut -c 1-2) -gt 33 ]; then - MOPT=tune -else - MOPT=cpu -fi - case "$ARCH" in - i486) SLKCFLAGS="-O2 -march=i486 -m${MOPT}=i686" + i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; s390) SLKCFLAGS="-O2" @@ -139,11 +134,7 @@ echo "++" cd $TMP/tmp-$PRGNAM echo "Extracting the source archive(s) for $PRGNAM..." -if $(file ${SOURCE} | grep -q ": bzip2"); then - tar -xjvf ${SOURCE} -elif $(file ${SOURCE} | grep -q ": gzip"); then - tar -xzvf ${SOURCE} -fi +tar -xvf ${SOURCE} cd ${PRGNAM}-${VERSION} chown -R root:root . chmod -R u+w,go+r-w,a-s . @@ -164,8 +155,8 @@ CFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --mandir=/usr/man \ ${PYTHONSTUFF} \ - --program-prefix="" \ - --program-suffix="" \ + --program-prefix= \ + --program-suffix= \ --build=$ARCH-slackware-linux \ 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log @@ -211,8 +202,3 @@ md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${ cd - cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Clean up the extra stuff: -if [ "$P1" = "--cleanup" ]; then - rm -rf $TMP/tmp-$PRGNAM - rm -rf $PKG -fi |