summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikko Värri <vmj@linuxbox.fi>2012-06-27 16:11:32 -0400
committerdsomero <xgizzmo@slackbuilds.org>2012-06-27 16:11:32 -0400
commit7182a541b33d4d663f142261ac3018a6724fdda2 (patch)
tree0e13ace037e9e58dedfcc1e11460392eed9235df
parent38b0ffc5250115358ccf8676894a4fbdea862826 (diff)
downloadslackbuilds-7182a541b33d4d663f142261ac3018a6724fdda2.tar.gz
haskell/haskell-utf8-string: Adjust build for ghc 7.4.x.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
-rw-r--r--haskell/haskell-utf8-string/README3
-rw-r--r--haskell/haskell-utf8-string/haskell-utf8-string.SlackBuild17
-rw-r--r--haskell/haskell-utf8-string/haskell-utf8-string.info2
3 files changed, 13 insertions, 9 deletions
diff --git a/haskell/haskell-utf8-string/README b/haskell/haskell-utf8-string/README
index b138b17ef6..1f6d98e2ff 100644
--- a/haskell/haskell-utf8-string/README
+++ b/haskell/haskell-utf8-string/README
@@ -3,3 +3,6 @@ operations for encoding UTF8 strings to Word8 lists and back, and
for reading and writing UTF8 without truncation.
This requires ghc.
+
+After uninstalling, run this command to unregister the package from
+the ghc package database: ghc-pkg recache
diff --git a/haskell/haskell-utf8-string/haskell-utf8-string.SlackBuild b/haskell/haskell-utf8-string/haskell-utf8-string.SlackBuild
index 4654824c5c..1fe4f4a367 100644
--- a/haskell/haskell-utf8-string/haskell-utf8-string.SlackBuild
+++ b/haskell/haskell-utf8-string/haskell-utf8-string.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for utf8-string
-# 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-utf8-string
VERSION=${VERSION:-0.3.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.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-utf8-string/haskell-utf8-string.info b/haskell/haskell-utf8-string/haskell-utf8-string.info
index 582f76a9f1..8c404ab953 100644
--- a/haskell/haskell-utf8-string/haskell-utf8-string.info
+++ b/haskell/haskell-utf8-string/haskell-utf8-string.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Mikko Värri"
EMAIL="vmj@linuxbox.fi"
-APPROVED="dsomero,Niels Horn"
+APPROVED="dsomero"