diff options
| author |   Eric Hameleers <alien@slackware.com> | 2010-01-30 22:14:13 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2010-01-30 22:14:13 +0000 |
| commit | 065a8a20486df29119a3ee56d8cdafd25b268195 (patch) | |
| tree | 87a547526fa91cbaed39d829dea218fe4a1a79ab /libdca | |
| parent | 13d4f473ddee81392aae7611cc94191287827dad (diff) | |
| download | asb-065a8a20486df29119a3ee56d8cdafd25b268195.tar.gz asb-065a8a20486df29119a3ee56d8cdafd25b268195.tar.xz | |
Updated for Slackware 13
Diffstat (limited to 'libdca')
| -rwxr-xr-x | libdca/build/libdca.SlackBuild | 37 |
1 files changed, 13 insertions, 24 deletions
diff --git a/libdca/build/libdca.SlackBuild b/libdca/build/libdca.SlackBuild index 1e28648c..5de50e0f 100755 --- a/libdca/build/libdca.SlackBuild +++ b/libdca/build/libdca.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright (c) 2009 Eric Hameleers <alien@slackware.com> +# Copyright (c) 2009,2010 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -32,6 +32,8 @@ # Changelog: # 0.0.5-1: 19/May/2009 by Eric Hameleers <alien@slackware.com> # * Initial build. +# 0.0.5-2: 30/Jan/2010 by Eric Hameleers <alien@slackware.com> +# * Rebuild. # # Run 'sh libdca.SlackBuild' to build a Slackware package. # The package (.tgz) and .txt file as well as build logs are created in /tmp . @@ -43,8 +45,7 @@ PRGNAM=libdca VERSION=${VERSION:-0.0.5} -ARCH=${ARCH:-i486} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:" -j4 "} TAG=${TAG:-alien} @@ -65,31 +66,25 @@ SRCURL="http://download.videolan.org/pub/videolan/${PRGNAM}/${VERSION}/${PRGNAM} ## --- with a little luck, you won't have to edit below this point --- ## ## -# Exit the script on errors: -set -e -trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR -# Catch unitialized variables: -set -u -P1=${1:-1} - case "$ARCH" in i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; - s390) SLKCFLAGS="-O2" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; - powerpc) SLKCFLAGS="-O2" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; x86_64) SLKCFLAGS="-O2 -fPIC" SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64" ;; - athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer" + *) SLKCFLAGS="-O2" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; esac +# Exit the script on errors: +set -e +trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR +# Catch unitialized variables: +set -u +P1=${1:-1} + # Create working directories: mkdir -p $OUTPUT # place for the package to be saved mkdir -p $TMP/tmp-$PRGNAM # location to build the source @@ -156,13 +151,7 @@ CFLAGS="$SLKCFLAGS" \ make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log # Install all the needed stuff to the package dir -# Use installwatch if available, to produce a logfile of the installation -# process that is more easily readable: -if $(which installwatch > /dev/null 2>&1); then - installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install -else - make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log -fi +make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log # Fix a broken symlink: ( cd $PKG/usr/lib${LIBDIRSUFFIX} |