diff options
| -rw-r--r-- | haskell/ghc/ghc.SlackBuild | 19 | ||||
| -rw-r--r-- | haskell/ghc/ghc.info | 12 |
2 files changed, 7 insertions, 24 deletions
diff --git a/haskell/ghc/ghc.SlackBuild b/haskell/ghc/ghc.SlackBuild index 8d4f600d77..bfbf069011 100644 --- a/haskell/ghc/ghc.SlackBuild +++ b/haskell/ghc/ghc.SlackBuild @@ -6,7 +6,7 @@ # Public domain. PRGNAM=ghc -VERSION=${VERSION:-7.0.1} +VERSION=${VERSION:-7.0.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -55,23 +55,6 @@ 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/haskell/ghc/ghc.info b/haskell/ghc/ghc.info index e67628dfbd..4ef56e1b25 100644 --- a/haskell/ghc/ghc.info +++ b/haskell/ghc/ghc.info @@ -1,10 +1,10 @@ PRGNAM="ghc" -VERSION="7.0.1" +VERSION="7.0.3" HOMEPAGE="http://haskell.org/ghc/" -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" +DOWNLOAD="http://haskell.org/ghc/dist/7.0.3/ghc-7.0.3-i386-unknown-linux.tar.bz2" +MD5SUM="80adbf2356bacbe79234da730a7dfb88" +DOWNLOAD_x86_64="http://haskell.org/ghc/dist/7.0.3/ghc-7.0.3-x86_64-unknown-linux.tar.bz2" +MD5SUM_x86_64="047d7fd883ab631503162bfcabea8e83" MAINTAINER="Mikko Värri" EMAIL="vmj@linuxbox.fi" -APPROVED="dsomero" +APPROVED="rworkman" |