diff options
author | Mikko Värri <vmj@linuxbox.fi> | 2012-06-27 16:06:07 -0400 |
---|---|---|
committer | dsomero <xgizzmo@slackbuilds.org> | 2012-06-27 16:06:07 -0400 |
commit | 6ac92dc573cc9e419867be3df713fcdfc0bece29 (patch) | |
tree | 34d4c1c75882eee4960e45467d407ba1ebd17b5b /haskell/haskell-regex-compat | |
parent | 135d5ba44cd9c39c1567488eabdf3820890c6427 (diff) |
haskell/haskell-regex-compat: Adjust build for ghc 7.4.x.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'haskell/haskell-regex-compat')
-rw-r--r-- | haskell/haskell-regex-compat/haskell-regex-compat.SlackBuild | 17 | ||||
-rw-r--r-- | haskell/haskell-regex-compat/haskell-regex-compat.info | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/haskell/haskell-regex-compat/haskell-regex-compat.SlackBuild b/haskell/haskell-regex-compat/haskell-regex-compat.SlackBuild index 60688e465f532..e77ac1c88339a 100644 --- a/haskell/haskell-regex-compat/haskell-regex-compat.SlackBuild +++ b/haskell/haskell-regex-compat/haskell-regex-compat.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for regex-compat -# 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-regex-compat VERSION=${VERSION:-0.95.1} -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.hs configure \ +runghc Setup configure \ --prefix=/usr \ --enable-shared \ + --enable-library-profiling \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --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-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-regex-compat/haskell-regex-compat.info b/haskell/haskell-regex-compat/haskell-regex-compat.info index 8d196f8e85bd7..9ae9c337af708 100644 --- a/haskell/haskell-regex-compat/haskell-regex-compat.info +++ b/haskell/haskell-regex-compat/haskell-regex-compat.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Mikko Värri" EMAIL="vmj@linuxbox.fi" -APPROVED="rworkman" +APPROVED="dsomero" |