From ccd5a621674df478b1fe3e86ce83a2e6a569503f Mon Sep 17 00:00:00 2001 From: Olivier Esser Date: Tue, 11 May 2010 22:24:15 +0200 Subject: [PATCH] libraries/pwlib: Updated for version 1.10.10 --- libraries/pwlib/pwlib.SlackBuild | 19 +++++++++++-------- libraries/pwlib/slack-desc | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/libraries/pwlib/pwlib.SlackBuild b/libraries/pwlib/pwlib.SlackBuild index 6f293834fa..0efa4e7637 100644 --- a/libraries/pwlib/pwlib.SlackBuild +++ b/libraries/pwlib/pwlib.SlackBuild @@ -5,14 +5,12 @@ # Written by Olivier Esser (olive001@tele2allin.be), based on # the template available at SlackBuilds.org (public domain). -# Exit on most errors -set -e - PRGNAM=pwlib VERSION=1.10.10 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM @@ -22,7 +20,11 @@ if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" fi + +set -e # Exit on most errors rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -38,15 +40,16 @@ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ - --localstatedir=/var + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux make make install DESTDIR=$PKG -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -) +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a ReadMe.txt History.txt ReadMe_QOS.txt $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/libraries/pwlib/slack-desc b/libraries/pwlib/slack-desc index 219c086e45..10601fb38a 100644 --- a/libraries/pwlib/slack-desc +++ b/libraries/pwlib/slack-desc @@ -5,7 +5,7 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler------------------------------------------------------| + |-----handy-ruler-------------------------------------------------------| pwlib: pwlib (Classes for I/O portability) pwlib: pwlib: PWLib is a moderately large class library intended to assist in writing