diff options
author | Mikko Värri <vmj@linuxbox.fi> | 2012-06-27 16:02:28 -0400 |
---|---|---|
committer | dsomero <xgizzmo@slackbuilds.org> | 2012-06-27 16:02:28 -0400 |
commit | 3e9b7ff65a2c92ff4177fd163a707f20eb78ae8f (patch) | |
tree | 1ac41e4bbf146ea0d036086a6326aaae5ab9cdf7 | |
parent | ec72bbc74c50d0c87a39156a341ceaf13dc26202 (diff) |
haskell/haskell-MonadCatchIO-mtl: Adjust build for ghc 7.4.x.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
3 files changed, 13 insertions, 9 deletions
diff --git a/haskell/haskell-MonadCatchIO-mtl/README b/haskell/haskell-MonadCatchIO-mtl/README index 156680c936e75..2757829c759c0 100644 --- a/haskell/haskell-MonadCatchIO-mtl/README +++ b/haskell/haskell-MonadCatchIO-mtl/README @@ -4,3 +4,6 @@ MonadIO. It defines proper instances for most monad transformers in the mtl library. This requires ghc, haskell-transformers, and haskell-mtl. + +After uninstalling, run this command to unregister the package from +the ghc package database: ghc-pkg recache diff --git a/haskell/haskell-MonadCatchIO-mtl/haskell-MonadCatchIO-mtl.SlackBuild b/haskell/haskell-MonadCatchIO-mtl/haskell-MonadCatchIO-mtl.SlackBuild index d68c7f71068df..a8a99a29f8d44 100644 --- a/haskell/haskell-MonadCatchIO-mtl/haskell-MonadCatchIO-mtl.SlackBuild +++ b/haskell/haskell-MonadCatchIO-mtl/haskell-MonadCatchIO-mtl.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for MonadCatchIO-mtl -# Copyright 2011 Mikko Värri, Finland +# Copyright 2012 Mikko Värri, Finland # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=haskell-MonadCatchIO-mtl VERSION=${VERSION:-0.3.0.4} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} SRCNAM="$( echo $PRGNAM | cut -d- -f2- )" @@ -75,24 +75,25 @@ find . \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -runghc Setup.lhs configure \ +runghc Setup configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \ --enable-shared \ + --enable-library-profiling \ --docdir=/usr/doc/$PRGNAM-$VERSION -runghc Setup.lhs build -runghc Setup.lhs haddock -runghc Setup.lhs copy --destdir=$PKG -runghc Setup.lhs register --gen-pkg-config +runghc Setup build +runghc Setup haddock +runghc Setup copy --destdir=$PKG +runghc Setup 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 \ +find $PKG -print0 | xargs -0 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 diff --git a/haskell/haskell-MonadCatchIO-mtl/haskell-MonadCatchIO-mtl.info b/haskell/haskell-MonadCatchIO-mtl/haskell-MonadCatchIO-mtl.info index 76610046050b8..4a5ebb5663ca9 100644 --- a/haskell/haskell-MonadCatchIO-mtl/haskell-MonadCatchIO-mtl.info +++ b/haskell/haskell-MonadCatchIO-mtl/haskell-MonadCatchIO-mtl.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Mikko Värri" EMAIL="vmj@linuxbox.fi" -APPROVED="rworkman,Niels Horn" +APPROVED="dsomero" |