diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2010-12-08 12:49:55 -0600 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2010-12-09 08:44:02 -0600 |
| commit | d9786ad891acf90b622aeeee4fd9205ecbaed9c9 (patch) | |
| tree | d2a7aa9e2065a50776ef49d7b4123dc75731aed2 | |
| parent | c001394930c69c2011603376ef66bc80112cae84 (diff) | |
libraries/slib: Miscellaneous build and runtime fixes
Thanks to Richard_Cranium on LQ for help with this.
http://www.linuxquestions.org/questions/slackware-14/gnucash-guile-slib-dont-get-along-848185/
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
| -rw-r--r-- | libraries/slib/doinst.sh | 1 | ||||
| -rw-r--r-- | libraries/slib/guile-slibcat.script | 3 | ||||
| -rw-r--r-- | libraries/slib/slib.SlackBuild | 30 |
3 files changed, 11 insertions, 23 deletions
diff --git a/libraries/slib/doinst.sh b/libraries/slib/doinst.sh new file mode 100644 index 000000000000..41cfc6360e30 --- /dev/null +++ b/libraries/slib/doinst.sh @@ -0,0 +1 @@ +chroot . /usr/bin/guile -q -s /usr/doc/@PRGNAM@-@VERSION@/guile-slibcat.script diff --git a/libraries/slib/guile-slibcat.script b/libraries/slib/guile-slibcat.script new file mode 100644 index 000000000000..bccf751cc72a --- /dev/null +++ b/libraries/slib/guile-slibcat.script @@ -0,0 +1,3 @@ +(use-modules (ice-9 slib)) +(require 'new-catalog) +(quit) diff --git a/libraries/slib/slib.SlackBuild b/libraries/slib/slib.SlackBuild index 7e9a588f7eba..3a33ff1198c5 100644 --- a/libraries/slib/slib.SlackBuild +++ b/libraries/slib/slib.SlackBuild @@ -24,15 +24,13 @@ PRGNAM=slib VERSION=3b2 -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -79,10 +77,8 @@ make libdir=/usr/lib${LIBDIRSUFFIX}/ install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done # The Makefile is braindead sed -i "s%$PKG%%g" $PKG/usr/bin/slib @@ -102,23 +98,11 @@ cp -a \ ANNOUNCE FAQ COPYING ChangeLog README \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -# Guile script to be run on installation, to build slibcat -cat >> $PKG/usr/doc/$PRGNAM-$VERSION/guile-slibcat.script << EOF -(use-modules (ice-9 slib)) -(require 'new-catalog) -(quit) -EOF - +cat $CWD/guile-slibcat.script > $PKG/usr/doc/$PRGNAM-$VERSION/guile-slibcat.script mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -cat >> $PKG/install/doinst.sh <<EOF -#!/bin/sh - -guile -q -s /usr/doc/$PRGNAM-$VERSION/guile-slibcat.script - -EOF - +sed -e s/@PRGNAM@/$PRGNAM/ -e s/@VERSION@/$VERSION/ $CWD/doinst.sh > $PKG/install/doinst.sh + cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} |