aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikko Värri <vmj@linuxbox.fi>2012-06-27 15:55:42 -0400
committerdsomero <xgizzmo@slackbuilds.org>2012-06-27 15:55:42 -0400
commit97ef00d85bd8511f32a0458a1bad1b8aa0bf81c7 (patch)
tree021dcb8d1f68b80be9baae225587a117a0736d52
parent921dc22af05a99b4f1f77de638622da1caf1830e (diff)
haskell/haskell-dlist: Adjust build for ghc 7.4.x.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
-rw-r--r--haskell/haskell-dlist/haskell-dlist.SlackBuild35
-rw-r--r--haskell/haskell-dlist/haskell-dlist.info4
2 files changed, 29 insertions, 10 deletions
diff --git a/haskell/haskell-dlist/haskell-dlist.SlackBuild b/haskell/haskell-dlist/haskell-dlist.SlackBuild
index 97c11b744623a..55c3cdbb62907 100644
--- a/haskell/haskell-dlist/haskell-dlist.SlackBuild
+++ b/haskell/haskell-dlist/haskell-dlist.SlackBuild
@@ -3,11 +3,29 @@
# Slackware build script for dlist
# Written by Peter Wang (novalazy@gmail.com)
-# Public domain.
+# Copyright 2012 Mikko Värri, Finland
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=haskell-dlist
VERSION=${VERSION:-0.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
SRCNAM="$( echo $PRGNAM | cut -d- -f2- )"
@@ -58,24 +76,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-dlist/haskell-dlist.info b/haskell/haskell-dlist/haskell-dlist.info
index 0073c9fc27c20..afb9747b62272 100644
--- a/haskell/haskell-dlist/haskell-dlist.info
+++ b/haskell/haskell-dlist/haskell-dlist.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://hackage.haskell.org/packages/archive/dlist/0.5/dlist-0.5.tar.gz
MD5SUM="54f6c18ff689b7ef54e3229dc4a94107"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-MAINTAINER="Peter Wang"
-EMAIL="novalazy@gmail.com"
+MAINTAINER="Mikko Värri"
+EMAIL="vmj@linuxbox.fi"
APPROVED="dsomero"