Date: Sunday, December 13, 2009 @ 01:02:00 Author: vesa Revision: 61179
bump => 6.12.1 Modified: ghc/trunk/PKGBUILD ghc/trunk/build.mk ----------+ PKGBUILD | 23 ++++++--------- build.mk | 93 +++++++++++++++++++++++++++++++++++++++++++------------------ 2 files changed, 76 insertions(+), 40 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2009-12-13 05:17:07 UTC (rev 61178) +++ PKGBUILD 2009-12-13 06:02:00 UTC (rev 61179) @@ -1,37 +1,34 @@ # $Id$ # Maintainer: Vesa Kaihlavirta <[email protected]> pkgname=ghc -pkgver=6.10.4 +pkgver=6.12.1 pkgrel=1 pkgdesc="The Glasgow Haskell Compiler" arch=(i686 x86_64) url="http://www.haskell.org/ghc/"; license=("custom") -depends=(gmp) +depends=(gmp perl) makedepends=(ghc happy perl) provides=(haskell-cabal) replaces=("haskell-cabal<1.6.0.3") -backup=(usr/lib/ghc-6.10.4/package.conf) +backup=(usr/lib/ghc-6.12.1/package.conf) install=(ghc.install) source=("http://www.haskell.org/ghc/dist/$pkgver/$pkgname-$pkgver-src.tar.bz2"; \ - "http://www.haskell.org/ghc/dist/$pkgver/$pkgname-$pkgver-src-extralibs.tar.bz2"; +# "http://www.haskell.org/ghc/dist/$pkgver/$pkgname-$pkgver-src-extralibs.tar.bz2"; build.mk ghc.install) build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver - cp $startdir/build.mk mk/build.mk + cp ../../build.mk mk/build.mk ./configure --prefix=/usr - make -j2 || return 1 - make DESTDIR=$startdir/pkg install + make -j1 || return 1 + make DESTDIR=$pkgdir install install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/ghc/license } - - -md5sums=('167687fa582ef6702aaac24e139ec982' - '37ce285617d7cebabc3cf6805bdbca25' - 'a05681b982aad44cc6770bd021e35b67' +md5sums=('3a2b23f29013605f721ebdfc29de9c92' + '31f83779da0e727dbe536ba671281e47' 'd03bca6b591043c0fe996d72dd448919') Modified: build.mk =================================================================== --- build.mk 2009-12-13 05:17:07 UTC (rev 61178) +++ build.mk 2009-12-13 06:02:00 UTC (rev 61179) @@ -16,14 +16,16 @@ # Fast build with optimised libraries: #BuildFlavour = quick +# Profile the stage2 compiler: +#BuildFlavour = prof + # A development build, working on the stage 1 compiler: #BuildFlavour = devel1 # A development build, working on the stage 2 compiler: #BuildFlavour = devel2 -# Which warnings we like to use -MyWarningOpts = -W -fno-warn-unused-matches -fwarn-unused-imports +GhcLibWays = v # -------- 1. A Performance/Distribution build-------------------------------- @@ -36,20 +38,27 @@ GhcStage2HcOpts = -O2 -fasm GhcHcOpts = -Rghc-timing GhcLibHcOpts = -O2 -XGenerics -GhcLibWays = p +GhcLibWays += p +ifeq "$(PlatformSupportsSharedLibs)" "YES" +GhcLibWays += dyn endif +endif + # -------- A Fast build ------------------------------------------------------ ifeq "$(BuildFlavour)" "quickest" -SRC_HC_OPTS = -H64m -O0 -fasm -GhcStage1HcOpts = -O -fasm -GhcStage2HcOpts = -O0 -fasm -GhcLibHcOpts = -O0 -fasm -GhcLibWays = -SplitObjs = NO +SRC_HC_OPTS = -H64m -O0 -fasm +GhcStage1HcOpts = -O -fasm +GhcStage2HcOpts = -O0 -fasm +GhcLibHcOpts = -O0 -fasm +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO endif @@ -57,25 +66,52 @@ ifeq "$(BuildFlavour)" "quick" -SRC_HC_OPTS = -H64m -O0 -fasm -GhcStage1HcOpts = -O -fasm -GhcStage2HcOpts = -O0 -fasm -GhcLibHcOpts = -O -fasm -GhcLibWays = -SplitObjs = NO +SRC_HC_OPTS = -H64m -O0 -fasm +GhcStage1HcOpts = -O -fasm +GhcStage2HcOpts = -O0 -fasm +GhcLibHcOpts = -O -fasm +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO endif +# -------- Profile the stage2 compiler --------------------------------------- + +ifeq "$(BuildFlavour)" "prof" + +SRC_HC_OPTS = -H64m -O0 -fasm +GhcStage1HcOpts = -O -fasm +GhcStage2HcOpts = -O -fasm +GhcLibHcOpts = -O -fasm + +GhcLibWays += p +GhcProfiled = YES + +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO + +endif + + # -------- A Development build (stage 1) ------------------------------------- ifeq "$(BuildFlavour)" "devel1" -SRC_HC_OPTS = -H64m -O -fasm $(MyWarningOpts) -GhcLibHcOpts = -O -dcore-lint $(MyWarningOpts) -GhcLibWays = -GhcStage1HcOpts = -Rghc-timing -O0 -DDEBUG -GhcStage2HcOpts = -Rghc-timing -O -fasm -SplitObjs = NO +SRC_HC_OPTS = -H64m -O -fasm +GhcLibHcOpts = -O -dcore-lint +GhcStage1HcOpts = -Rghc-timing -O0 -DDEBUG +GhcStage2HcOpts = -Rghc-timing -O -fasm +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO endif @@ -83,12 +119,15 @@ ifeq "$(BuildFlavour)" "devel2" -SRC_HC_OPTS = -H64m -O -fasm $(MyWarningOpts) -GhcLibHcOpts = -O -dcore-lint $(MyWarningOpts) -GhcLibWays = -GhcStage1HcOpts = -Rghc-timing -O -fasm -GhcStage2HcOpts = -Rghc-timing -O0 -DDEBUG -SplitObjs = NO +SRC_HC_OPTS = -H64m -O -fasm +GhcLibHcOpts = -O -dcore-lint +GhcStage1HcOpts = -Rghc-timing -O -fasm +GhcStage2HcOpts = -Rghc-timing -O0 -DDEBUG +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO endif
