development/ghc: Updated for version 7.0.1.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

3 files changed, 27 insertions, 12 deletions

diff --git a/development/ghc/README b/development/ghc/README
index 791b096f2c..d4cc3b8fd5 100644
--- a/development/ghc/README
+++ b/development/ghc/README
@@ -1,5 +1,3 @@
-ghc (The Glasgow Haskell Compiler)
-
-GHC is a state-of-the-art, open source, compiler and interactive environment 
-for the functional language Haskell.  This is a complete build, including 
+GHC is a state-of-the-art, open source, compiler and interactive environment
+for the functional language Haskell.  This is a complete build, including
 interactive system and profiling libraries and documentation.
diff --git a/development/ghc/ghc.SlackBuild b/development/ghc/ghc.SlackBuild
index 5b7b3c12ab..8d4f600d77 100644
--- a/development/ghc/ghc.SlackBuild
+++ b/development/ghc/ghc.SlackBuild
@@ -6,7 +6,7 @@
 # Public domain.
 
 PRGNAM=ghc
-VERSION=${VERSION:-6.12.3}
+VERSION=${VERSION:-7.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -46,7 +46,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-$TARARCH-unknown-linux-n.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION-$TARARCH-unknown-linux.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -55,6 +55,23 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+if [ "$TARARCH" = "i386" ] ; then
+    # In i386 binary distribution, the prebuilt binaries used to install GHC
+    # are linked against libffi.so.5, but slackware ships with libffi.so.4
+    # (in d/gcc-java).
+    # Luckily, GHC includes its own copy of libffi.  It's only under different
+    # name (to avoid conflicts with system libffi).
+    # For the duration of the "configure && make install", let's copy the
+    # bundled libffi to expected name.
+    cp libffi/dist-install/build/libHSffi-ghc${VERSION}.so libffi/libffi.so.5
+    if [ "x$LD_LIBRARY_PATH" = "x" ] ; then
+        LD_LIBRARY_PATH=$TMP/$PRGNAM-$VERSION/libffi/
+    else
+        LD_LIBRARY_PATH=$TMP/$PRGNAM-$VERSION/libffi/:$LD_LIBRARY_PATH
+    fi
+    export LD_LIBRARY_PATH
+fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/development/ghc/ghc.info b/development/ghc/ghc.info
index c7d3c66491..e67628dfbd 100644
--- a/development/ghc/ghc.info
+++ b/development/ghc/ghc.info
@@ -1,10 +1,10 @@
 PRGNAM="ghc"
-VERSION="6.12.3"
+VERSION="7.0.1"
 HOMEPAGE="http://haskell.org/ghc/"
-DOWNLOAD="http://darcs.haskell.org/download/dist/6.12.3/ghc-6.12.3-i386-unknown-linux-n.tar.bz2"
-MD5SUM="8ed8540571f7b10d8caf782755e35818"
-DOWNLOAD_x86_64="http://darcs.haskell.org/download/dist/6.12.3/ghc-6.12.3-x86_64-unknown-linux-n.tar.bz2"
-MD5SUM_x86_64="d58e5a50d8b120ac933afbd10a773aef"
+DOWNLOAD="http://haskell.org/ghc/dist/7.0.1/ghc-7.0.1-i386-unknown-linux.tar.bz2"
+MD5SUM="a06ca14cd21a7c79e77c360d8c3c405f"
+DOWNLOAD_x86_64="http://haskell.org/ghc/dist/7.0.1/ghc-7.0.1-x86_64-unknown-linux.tar.bz2"
+MD5SUM_x86_64="618cf4a24269ac03292fa5abb0ae3b82"
 MAINTAINER="Mikko Värri"
 EMAIL="vmj@linuxbox.fi"
-APPROVED="Erik Hanson"
+APPROVED="dsomero"