diff options
author | Eric Hameleers <alien@slackware.com> | 2009-01-09 22:39:12 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2009-01-09 22:39:12 +0000 |
commit | 5fd9616a4b4ebb0f5d01043cc661d9ed6fa26b50 (patch) | |
tree | e0496b893724f496eb3464cc0f7d3d228ab6f0d4 | |
parent | dd24437dab3cd030af5ce82cfb7a0f2f2aefe56e (diff) | |
download | asb-5fd9616a4b4ebb0f5d01043cc661d9ed6fa26b50.tar.gz asb-5fd9616a4b4ebb0f5d01043cc661d9ed6fa26b50.tar.xz |
Updated to 0.6.12
-rwxr-xr-x | libisofs/build/libisofs.SlackBuild | 59 |
1 files changed, 16 insertions, 43 deletions
diff --git a/libisofs/build/libisofs.SlackBuild b/libisofs/build/libisofs.SlackBuild index 0234e1a6..c2bcfb33 100755 --- a/libisofs/build/libisofs.SlackBuild +++ b/libisofs/build/libisofs.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 @@ -34,6 +34,8 @@ # * Initial build. # 0.6.10.pl01-1: 24/nov/2008 by Eric Hameleers <alien@slackware.com> # * Update +# 0.6.12-1: 09/jan/2009 by Eric Hameleers <alien@slackware.com> +# * Update # # Run 'sh libisofs.SlackBuild --cleanup' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -44,8 +46,9 @@ # Set initial variables: PRGNAM=libisofs -VERSION=${VERSION:-0.6.10.pl01} -SRCVER=$(echo $VERSION |rev| cut -d. -f2- |rev) +VERSION=${VERSION:-0.6.12} +#SRCVER=$(echo $VERSION |rev| cut -d. -f2- |rev) +SRCVER=$VERSION ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-alien} @@ -74,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" @@ -138,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} mv ${PRGNAM}-${SRCVER} ${PRGNAM}-${VERSION} cd ${PRGNAM}-${VERSION} chown -R root:root . @@ -163,37 +155,26 @@ 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 $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 {} \; # 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 -if [ -f $SRCDIR/slack-required ]; then - cat $SRCDIR/slack-required > $PKG/install/slack-required -fi # Build the package: cd $PKG @@ -202,12 +183,4 @@ cd $OUTPUT md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz.md5 cd - cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -if [ -f $PKG/install/slack-required ]; then - cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep -fi -# Clean up the extra stuff: -if [ "$P1" = "--cleanup" ]; then - rm -rf $TMP/tmp-$PRGNAM - rm -rf $PKG -fi |