diff options
author | Eric Hameleers <alien@slackware.com> | 2007-08-18 13:44:39 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2007-08-18 13:44:39 +0000 |
commit | a6ad19b515a3fc387c82a07377da1d5a11d7b8ff (patch) | |
tree | 4fede729327dbdab20279274f204c5204cc38a44 | |
parent | 16530038d98f176893e95a290f032ff9bb03b047 (diff) | |
download | asb-a6ad19b515a3fc387c82a07377da1d5a11d7b8ff.tar.gz asb-a6ad19b515a3fc387c82a07377da1d5a11d7b8ff.tar.xz |
Update. Also use my CFLAGS now
-rwxr-xr-x | ddrescue/build/ddrescue.SlackBuild | 49 |
1 files changed, 17 insertions, 32 deletions
diff --git a/ddrescue/build/ddrescue.SlackBuild b/ddrescue/build/ddrescue.SlackBuild index 8e37ca11..57275cee 100755 --- a/ddrescue/build/ddrescue.SlackBuild +++ b/ddrescue/build/ddrescue.SlackBuild @@ -34,6 +34,8 @@ # * Initial build. # 1.3-1: 03/Jun/2007 by Eric Hameleers <alien@slackware.com> # * Revamped the SlackBuild +# 1.5-1: 18/aug/2007 by Eric Hameleers <alien@slackware.com> +# * Update. # # Run 'sh ddrescue.SlackBuild --cleanup' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -44,7 +46,7 @@ # Set initial variables: PRGNAM=ddrescue -VERSION=${VERSION:-1.3} +VERSION=${VERSION:-1.5} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} @@ -60,7 +62,6 @@ TMP=${TMP:-/tmp/build} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -# Input URL: http://ftp.gnu.org/gnu/ddrescue/ddrescue-1.3.tar.bz2 SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.bz2" SRCURL="http://ftp.gnu.org/gnu/${PRGNAM}/${PRGNAM}-${VERSION}.tar.bz2" @@ -104,24 +105,11 @@ case "$ARCH" in esac # Create working directories: -if [ ! -d $TMP/tmp-$PRGNAM ]; then - mkdir -p $TMP/tmp-$PRGNAM # location to build the source -elif [ "$P1" != "--oldbuild" ]; then - # If the "--oldbuild" parameter is present, we keep - # the old build files and continue; - # By default we remove the remnants of previous build and continue: - rm -rf $TMP/tmp-$PRGNAM/* -fi - -if [ ! -d $PKG ]; then - mkdir -p $PKG # place for the package to be built -else - rm -rf $PKG/* # We always erase old package's contents: -fi - -if [ ! -d $OUTPUT ]; then - mkdir -p $OUTPUT # place for the package to be saved -fi +mkdir -p $TMP/tmp-$PRGNAM # location to build the source +rm -rf $TMP/tmp-$PRGNAM/* # By default we remove the remnants of previous build +mkdir -p $PKG # place for the package to be built +rm -rf $PKG/* # We always erase old package's contents: +mkdir -p $OUTPUT # place for the package to be saved # Source file availability: if ! [ -f ${SOURCE} ]; then @@ -161,14 +149,11 @@ if `file ${SOURCE} | grep -q ": bzip2"`; then elif `file ${SOURCE} | grep -q ": gzip"`; then tar -xzvf ${SOURCE} fi -chown -R root:root * -chmod -R u+w,go+r-w,a-s * - cd ${PRGNAM}-${VERSION} +chown -R root:root . +chmod -R u+w,go+r-w,a-s . echo Building ... -LDFLAGS="$SLKLDFLAGS" \ -CFLAGS="$SLKCFLAGS" \ ./configure --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --localstatedir=/var \ @@ -176,21 +161,22 @@ CFLAGS="$SLKCFLAGS" \ --datadir=/usr/share \ --mandir=/usr/man \ --infodir=/usr/info \ - --program-prefix="" \ - --program-suffix="" \ --build=$ARCH-slackware-linux \ + LDFLAGS="$SLKLDFLAGS" \ + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$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 install-man + installwatch -o $OUTPUT/install-${PRGNAM}.log \ + make DESTDIR=$PKG install install-man else - make DESTDIR=$PKG install install-man 2>&1 |tee $OUTPUT/install-${PRGNAM}.log + make DESTDIR=$PKG install install-man \ + 2>&1 |tee $OUTPUT/install-${PRGNAM}.log fi # Add documentation: @@ -216,7 +202,6 @@ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true cd - - # Add a package description: mkdir -p $PKG/install cat $SRCDIR/slack-desc > $PKG/install/slack-desc |