diff options
author | Eric Hameleers <alien@slackware.com> | 2009-01-09 22:35:09 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2009-01-09 22:35:09 +0000 |
commit | dd24437dab3cd030af5ce82cfb7a0f2f2aefe56e (patch) | |
tree | d42bb092ff30e4e0e58a2edd92a3a387e8bccb36 /libburn | |
parent | e4743e4eebb19e2b2b14958713c75596a96f43fc (diff) | |
download | asb-dd24437dab3cd030af5ce82cfb7a0f2f2aefe56e.tar.gz asb-dd24437dab3cd030af5ce82cfb7a0f2f2aefe56e.tar.xz |
Update to 0.6.0.pl01
Diffstat (limited to 'libburn')
-rwxr-xr-x | libburn/build/libburn.SlackBuild | 53 |
1 files changed, 15 insertions, 38 deletions
diff --git a/libburn/build/libburn.SlackBuild b/libburn/build/libburn.SlackBuild index 31daf45e..bb19f71d 100755 --- a/libburn/build/libburn.SlackBuild +++ b/libburn/build/libburn.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright (c) 2008 Eric Hameleers <alien@slackware.com> +# Copyright (c) 2008, 2009 Eric Hameleers, Eindhoven, Netherlands # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -38,8 +38,10 @@ # * Update # 0.5.6.pl00-1: 24/nov/2008 by Eric Hameleers <alien@slackware.com> # * Update +# 0.6.0.pl01-1: 09/jan/2009 by Eric Hameleers <alien@slackware.com> +# * Update # -# Run 'sh libburn.SlackBuild --cleanup' to build a Slackware package. +# Run 'sh libburn.SlackBuild' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . # Install using 'installpkg'. # @@ -48,7 +50,7 @@ # Set initial variables: PRGNAM=libburn -VERSION=${VERSION:-0.5.6.pl00} +VERSION=${VERSION:-0.6.0.pl01} SRCVER=$(echo $VERSION |rev| cut -d. -f2- |rev) ARCH=${ARCH:-i486} BUILD=${BUILD:-1} @@ -79,15 +81,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" @@ -143,11 +138,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} mv ${PRGNAM}-${SRCVER} ${PRGNAM}-${VERSION} cd ${PRGNAM}-${VERSION} chown -R root:root . @@ -169,20 +160,17 @@ CFLAGS="$SLKCFLAGS" \ 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log make 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 # Add documentation: mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true cp -a --parents $DOCS_CDRSKIN $PKG/usr/doc/$PRGNAM-$VERSION || true -cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cat $SRCDIR/$(basename $0) | sed \ + -e "/^VERSION=/s/:-.*}/:-$VERSION}/" \ + -e "/^ARCH=/s/:-.*}/:-$ARCH}/" \ + -e "/^BUILD=/s/:-.*}/:-$BUILD}/" \ + > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION find $PKG/usr/doc -type f -exec chmod 644 {} \; @@ -193,18 +181,12 @@ if [ -d $PKG/usr/man ]; then fi # Strip binaries: -cd $PKG -find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -cd - - +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null # Add a package description: mkdir -p $PKG/install cat $SRCDIR/slack-desc > $PKG/install/slack-desc -if [ -f $SRCDIR/doinst.sh ]; then - cat $SRCDIR/doinst.sh >> $PKG/install/doinst.sh -fi # Build the package: cd $PKG @@ -214,8 +196,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 |