summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Mikko Värri <vmj@linuxbox.fi>2012-06-27 16:02:07 -0400
committer dsomero <xgizzmo@slackbuilds.org>2012-06-27 16:02:07 -0400
commitec72bbc74c50d0c87a39156a341ceaf13dc26202 (patch)
tree05b7b485d5eeb529ca5a05796dcd3f6675224291
parent8ac88d1deba28c39e6ebd8029e90883a3186d44b (diff)
downloadslackbuilds-ec72bbc74c50d0c87a39156a341ceaf13dc26202.tar.gz
slackbuilds-ec72bbc74c50d0c87a39156a341ceaf13dc26202.tar.xz
haskell/haskell-mmap: Adjust build for ghc 7.4.x.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
-rw-r--r--haskell/haskell-mmap/haskell-mmap.SlackBuild17
-rw-r--r--haskell/haskell-mmap/haskell-mmap.info2
2 files changed, 10 insertions, 9 deletions
diff --git a/haskell/haskell-mmap/haskell-mmap.SlackBuild b/haskell/haskell-mmap/haskell-mmap.SlackBuild
index d947137b55..dc5a885c9b 100644
--- a/haskell/haskell-mmap/haskell-mmap.SlackBuild
+++ b/haskell/haskell-mmap/haskell-mmap.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for mmap
-# 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-mmap
VERSION=${VERSION:-0.5.7}
-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 \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \
--enable-shared \
+ --enable-library-profiling \
--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-mmap/haskell-mmap.info b/haskell/haskell-mmap/haskell-mmap.info
index b963a116e4..69a84b2094 100644
--- a/haskell/haskell-mmap/haskell-mmap.info
+++ b/haskell/haskell-mmap/haskell-mmap.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Mikko Värri"
EMAIL="vmj@linuxbox.fi"
-APPROVED="rworkman"
+APPROVED="dsomero"