diff options
| author | Mikko Värri <vmj@linuxbox.fi> | 2010-07-16 13:51:04 -0500 |
|---|---|---|
| committer | Erik Hanson <erik@slackbuilds.org> | 2010-07-21 01:42:40 -0500 |
| commit | 5ca4ce46ad8acf75f3448a6c5084db36b53ccf30 (patch) | |
| tree | a025a9f289991ae5d88dd205f9b4a9e6084a3c2f /libraries | |
| parent | e45dd7ad232aae5404c5a0ee46c7595b0cf7193d (diff) | |
| download | slackbuilds-5ca4ce46ad8acf75f3448a6c5084db36b53ccf30.tar.gz | |
libraries/haskell-packedstring: Build bump, various changes.
Signed-off-by: Erik Hanson <erik@slackbuilds.org>
Diffstat (limited to 'libraries')
4 files changed, 22 insertions, 23 deletions
diff --git a/libraries/haskell-packedstring/README b/libraries/haskell-packedstring/README index a957cebe81..cf6cde6cd2 100644 --- a/libraries/haskell-packedstring/README +++ b/libraries/haskell-packedstring/README @@ -4,5 +4,5 @@ This library is deprecated and should not be used in new code. This requires ghc. -When uninstalling, run this command to unregister the package from the ghc -package database: ghc-pkg unregister packedstring +After uninstalling, run this command to unregister the package from the ghc +package database: ghc-pkg recache diff --git a/libraries/haskell-packedstring/doinst.sh b/libraries/haskell-packedstring/doinst.sh index 4038a8fd5c..3268c238bf 100644 --- a/libraries/haskell-packedstring/doinst.sh +++ b/libraries/haskell-packedstring/doinst.sh @@ -1,3 +1 @@ -chroot . sh /install/register.sh -rm -f install/register.sh -rmdir install 2>/dev/null +chroot . /usr/bin/ghc-pkg recache diff --git a/libraries/haskell-packedstring/haskell-packedstring.SlackBuild b/libraries/haskell-packedstring/haskell-packedstring.SlackBuild index 3300fe5a0a..a1714565c0 100644 --- a/libraries/haskell-packedstring/haskell-packedstring.SlackBuild +++ b/libraries/haskell-packedstring/haskell-packedstring.SlackBuild @@ -1,24 +1,22 @@ #!/bin/sh -# Slackware build script for haskell-packedstring +# Slackware build script for packedstring -# Written by Mikko Varri (vmj@linuxbox.fi) +# Written by Mikko Värri (vmj@linuxbox.fi) # Public domain. -PRGNAM=haskell-packedstring +SRCNAM=packedstring +PRGNAM=haskell-$SRCNAM VERSION=${VERSION:-0.1.0.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -TARNAM=packedstring -GHC_VERSION=$(ghc-pkg field ghc version | cut -d' ' -f2) +GHC_VERSION=$(ghc --numeric-version) -# 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 @@ -47,9 +45,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $TARNAM-$VERSION -tar xvf $CWD/$TARNAM-$VERSION.tar.gz -cd $TARNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -58,18 +56,23 @@ find . \ -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ runghc Setup.hs configure \ --prefix=/usr \ --enable-shared \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --libsubdir=ghc-${GHC_VERSION}/$TARNAM-$VERSION \ + --libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \ --docdir=/usr/doc/$PRGNAM-$VERSION runghc Setup.hs build runghc Setup.hs haddock runghc Setup.hs copy --destdir=$PKG -runghc Setup.hs register --gen-script +runghc Setup.hs register --gen-pkg-config + +PKGCONFD=/usr/lib${LIBDIRSUFFIX}/ghc-${GHC_VERSION}/package.conf.d +PKGID=$( grep -E "^id: " $SRCNAM-$VERSION.conf | cut -d" " -f2 ) +mkdir -p $PKG/$PKGCONFD +mv $SRCNAM-$VERSION.conf $PKG/$PKGCONFD/$PKGID.conf find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -81,8 +84,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/doinst.sh > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc -mv $TMP/$TARNAM-$VERSION/register.sh $PKG/install/register.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} - diff --git a/libraries/haskell-packedstring/haskell-packedstring.info b/libraries/haskell-packedstring/haskell-packedstring.info index 6ec4e5c6db..bafef6d489 100644 --- a/libraries/haskell-packedstring/haskell-packedstring.info +++ b/libraries/haskell-packedstring/haskell-packedstring.info @@ -5,6 +5,6 @@ DOWNLOAD="http://hackage.haskell.org/packages/archive/packedstring/0.1.0.1/packe MD5SUM="ea0bdcb92f4c5bd78ac8bb7a654fcfb2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -MAINTAINER="Mikko Varri" +MAINTAINER="Mikko Värri" EMAIL="vmj@linuxbox.fi" -APPROVED="rworkman" +APPROVED="Erik Hanson" |