summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Mikko Värri <vmj@linuxbox.fi>2012-06-27 15:56:48 -0400
committer dsomero <xgizzmo@slackbuilds.org>2012-06-27 15:56:48 -0400
commit23b25fdcb25c53e199ba2ef281d6baad220ce969 (patch)
tree27932a9254721d58c8d1c2de4f6a6e504083a626
parentef7f3b5b66a900845881aa215c03be8950917cb9 (diff)
downloadslackbuilds-23b25fdcb25c53e199ba2ef281d6baad220ce969.tar.gz
slackbuilds-23b25fdcb25c53e199ba2ef281d6baad220ce969.tar.xz
haskell/haskell-ghc-paths: Adjust build for ghc 7.4.x.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
-rw-r--r--haskell/haskell-ghc-paths/haskell-ghc-paths.SlackBuild17
-rw-r--r--haskell/haskell-ghc-paths/haskell-ghc-paths.info2
2 files changed, 10 insertions, 9 deletions
diff --git a/haskell/haskell-ghc-paths/haskell-ghc-paths.SlackBuild b/haskell/haskell-ghc-paths/haskell-ghc-paths.SlackBuild
index 23d715b59b..59ded0b26f 100644
--- a/haskell/haskell-ghc-paths/haskell-ghc-paths.SlackBuild
+++ b/haskell/haskell-ghc-paths/haskell-ghc-paths.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for ghc-paths
-# 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-ghc-paths
VERSION=${VERSION:-0.1.0.8}
-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-ghc-paths/haskell-ghc-paths.info b/haskell/haskell-ghc-paths/haskell-ghc-paths.info
index 4c2c5064ce..f17f044eb8 100644
--- a/haskell/haskell-ghc-paths/haskell-ghc-paths.info
+++ b/haskell/haskell-ghc-paths/haskell-ghc-paths.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Mikko Värri"
EMAIL="vmj@linuxbox.fi"
-APPROVED="rworkman"
+APPROVED="dsomero"