Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=43c3477776f4fd147c8cbb6fad601065afb22b1d

commit 43c3477776f4fd147c8cbb6fad601065afb22b1d
Author: Michel Hermier <herm...@frugalware.org>
Date:   Tue Jan 11 09:38:57 2011 +0100

ghc-7.0.1-3-i686

* Rebuild with libffi.

diff --git a/source/devel-extra/ghc/FrugalBuild 
b/source/devel-extra/ghc/FrugalBuild
index 0144bef..88aff73 100644
--- a/source/devel-extra/ghc/FrugalBuild
+++ b/source/devel-extra/ghc/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=ghc
pkgver=7.0.1
-pkgrel=2
+pkgrel=3
pkgdesc="The Glasgow Haskell Compiler"
url="http://www.haskell.org/ghc/";
depends=('gmp' 'readline' 'libedit' 'libffi')
@@ -15,8 +15,8 @@ if [ "$CARCH" == "i686" ]; then
else
_arch=$CARCH
fi
-source=(http://new-www.haskell.org/ghc/dist/$pkgver/ghc-$pkgver-src.tar.bz2 \
-       
http://new-www.haskell.org/ghc/dist/$pkgver/ghc-$pkgver-$_arch-unknown-linux.tar.bz2)
+source=(http://www.haskell.org/ghc/dist/$pkgver/ghc-$pkgver-src.tar.bz2 \
+       
http://www.haskell.org/ghc/dist/$pkgver/ghc-$pkgver-$_arch-unknown-linux.tar.bz2)
sha1sums=('fdd71deaa4e9a14ac71dfc9ab355947547529a5c')
if [ "$CARCH" == "i686" ]; then
sha1sums=(${sha1su...@]} 'ebcdb48d660328d37ff0651d30997059647ca0ed')
@@ -31,10 +31,6 @@ build()
mv ghc-$pkgver ghc-$pkgver-binary || return 1
cd ghc-$pkgver-binary

-       # hack
-       ln -s /usr/lib/libffi.so libffi.so.5
-       export LD_LIBRARY_PATH=$(pwd)
-
./configure --prefix=$Fsrcdir/binary || return 1
make install || return 1
export PATH=$Fsrcdir/binary/bin:$PATH
@@ -44,6 +40,6 @@ build()
_F_conf_notry="build"
Fmake
# Fmakeinstall doesn't handle this pkg
-       make DESTDIR=$Fdestdir install || return 1
+       make DESTDIR=$Fdestdir install || Fdie
}
# optimization OK
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to