Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a3198d2627edf029b1314e008e54f67a4d59f015
commit a3198d2627edf029b1314e008e54f67a4d59f015 Author: crazy <[email protected]> Date: Fri Mar 17 16:50:59 2017 +0100 ghc-8.0.2-1-x86_64 * Version bump * added an hackISh patch to allow building with old ghc which * doesn't have right --build= * build with system ffi diff --git a/source/devel-extra/ghc/FrugalBuild b/source/devel-extra/ghc/FrugalBuild index 11506ae..9f9e875 100644 --- a/source/devel-extra/ghc/FrugalBuild +++ b/source/devel-extra/ghc/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Miklos Vajna <[email protected]> pkgname=ghc -pkgver=7.10.3 -pkgrel=2 +pkgver=8.0.2 +pkgrel=1 pkgdesc="The Glasgow Haskell Compiler" url="http://www.haskell.org/ghc/" depends=('gmp>=5.0.1' 'readline>=6.3-7' 'ncurses>=6.0-4' 'libedit>=20150325_3.1-3' 'libffi>=3.2.1') @@ -13,19 +13,29 @@ archs=('i686' 'x86_64') _F_archive_grepv="rc" options+=('scriptlet' 'static') up2date="Flastverdir http://downloads.haskell.org/~ghc/" -source=(http://www.haskell.org/$pkgname/dist/$pkgver/$pkgname-$pkgver-src.tar.xz) -sha1sums=('471a3df55c7f5ac6be75109d0c29de97842b98e9') - -replaces=('haskell-transformers' 'haskell-xhtml' 'haskell-array' - 'haskell-binary' 'haskell-containers' 'haskell-deepseq' - 'haskell-haskeline' 'haskell-terminfo') +source=(http://www.haskell.org/$pkgname/dist/$pkgver/$pkgname-$pkgver-src.tar.xz go-on.patch) +sha1sums=('0e0ae6d5ba119c10f3c7b807d35166e7c06b9b35' \ + '38307594c32a5cd0277e88c772ff4e8dcef51310') + +replaces=('haskell-transformers' + 'haskell-xhtml' + 'haskell-array' + 'haskell-binary' + 'haskell-containers' + 'haskell-deepseq' + 'haskell-haskeline' + 'haskell-terminfo') conflicts=("${replaces[@]}") provides=("${provides[@]}") +_Fbuild_no_patch="yes" build() { - _F_conf_notry="build" - Fbuild + Fpatchall + Fautoreconf + + Fbuild --with-system-libffi \ + --with-ffi-includes="$(pkg-config --variable=includedir libffi)" Fmkdir etc/ld.so.conf.d/ cd $Fdestdir @@ -36,10 +46,6 @@ build() done - # Fix broken symlink - Frm usr/lib/ghc-${pkgver}/rts/libffi.so.6 - Fln usr/lib/ghc-${pkgver}/rts/libffi.so.6.0.2 usr/lib/ghc-${pkgver}/rts/libffi.so.6 - } # optimization OK diff --git a/source/devel-extra/ghc/go-on.patch b/source/devel-extra/ghc/go-on.patch new file mode 100644 index 0000000..ec2137a --- /dev/null +++ b/source/devel-extra/ghc/go-on.patch @@ -0,0 +1,23 @@ +diff -Naur ghc-8.0.2/aclocal.m4 ghc-8.0.2-p/aclocal.m4 +--- ghc-8.0.2/aclocal.m4 2017-01-03 16:59:18.000000000 +0100 ++++ ghc-8.0.2-p/aclocal.m4 2017-03-17 15:57:18.389731566 +0100 +@@ -227,7 +227,7 @@ + + checkVendor() { + case [$]1 in +- dec|unknown|hp|apple|next|sun|sgi|ibm|montavista|portbld) ++ dec|unknown|hp|apple|next|sun|sgi|ibm|montavista|portbld|frugalware) + ;; + *) + echo "Unknown vendor [$]1" +diff -Naur ghc-8.0.2/configure.ac ghc-8.0.2-p/configure.ac +--- ghc-8.0.2/configure.ac 2017-01-04 15:17:17.000000000 +0100 ++++ ghc-8.0.2-p/configure.ac 2017-03-17 15:57:40.580307264 +0100 +@@ -220,7 +220,6 @@ + echo "This GHC (${WithGhc}) does not generate code for the build platform" + echo " GHC target platform : $bootstrap_target" + echo " Desired build platform : $BuildPlatform" +- exit 1 + fi + + # Testing if we shall enable shared libs support on Solaris. _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
