[arch-commits] Commit in ghc/trunk (PKGBUILD build.mk)

[Vesa Kaihlavirta]

    Date: Thursday, October 9, 2008 @ 07:33:31
  Author: vesa
Revision: 14699

update to a prerelease of 6.10

Modified:
  ghc/trunk/PKGBUILD
  ghc/trunk/build.mk

----------+
 PKGBUILD |   29 +++++++++++++++--------------
 build.mk |   22 +++++++++++++---------
 2 files changed, 28 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-10-09 09:38:41 UTC (rev 14698)
+++ PKGBUILD	2008-10-09 11:33:31 UTC (rev 14699)
@@ -1,21 +1,24 @@
 # $Id$
 # Maintainer: Vesa Kaihlavirta <vesa at archlinux.org>
 pkgname=ghc
-pkgver=6.8.2
-pkgrel=2.1
+pkgver=6.10.0.20080921
+pkgrel=1
 pkgdesc="A state-of-the-art, open source, compiler and interactive environment for Haskell."
 arch=(i686 x86_64)
 url="http://www.haskell.org/ghc/"
 license="custom"
-depends=('gmp' 'perl' 'readline')
-makedepends=('ghc' 'happy')
-source=("http://www.haskell.org/ghc/dist/$pkgver/$pkgname-$pkgver-src.tar.bz2" \
-    "http://www.haskell.org/ghc/dist/$pkgver/ghc-$pkgver-src-extralibs.tar.bz2"
-    network.patch build.mk)
-md5sums=('43108417594be7eba0918c459e871e40'
-         'd199c50814188fb77355d41058b8613c'
-         'dc94374c53aff2ab2d4f6cb75a349bb0'
-         '7a633e9fcc882d8874373481461acadb')
+depends=(gmp libedit)
+makedepends=(ghc happy perl)
+source=("http://www.haskell.org/ghc/dist/stable/dist/ghc-6.10.0.20080921-src.tar.bz2" 
+        "http://www.haskell.org/ghc/dist/stable/dist/ghc-6.10.0.20080921-src-extralibs.tar.bz2")
+        
+#source=("http://www.haskell.org/ghc/dist/$pkgver/$pkgname-$pkgver-src.tar.bz2" \
+#    "http://www.haskell.org/ghc/dist/$pkgver/ghc-$pkgver-src-extralibs.tar.bz2"
+#     build.mk)
+#md5sums=('43108417594be7eba0918c459e871e40'
+#         'd199c50814188fb77355d41058b8613c'
+#         'dc94374c53aff2ab2d4f6cb75a349bb0'
+#         '7a633e9fcc882d8874373481461acadb')
 
 build() {
   #since this is a compiler, it needs itself to compile
@@ -23,14 +26,12 @@
   #In order to compile, you need ghc installed on your system
   cd $startdir/src/$pkgname-$pkgver
 
-  # http://hackage.haskell.org/trac/ghc/ticket/2314
-  patch -p1 -i ../network.patch || return 1
   cd libraries/network && autoreconf || return 1
   cd - 
 
   cp $startdir/build.mk mk/build.mk
 
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr 
   make -j2 || return 1
   make DESTDIR=$startdir/pkg install
 

Modified: build.mk
===================================================================
--- build.mk	2008-10-09 09:38:41 UTC (rev 14698)
+++ build.mk	2008-10-09 11:33:31 UTC (rev 14699)
@@ -29,21 +29,25 @@
 
 ifeq "$(BuildFlavour)" "perf"
 
-SRC_HC_OPTS   = -H32m -O2
-GhcHcOpts     = -Rghc-timing
-GhcLibHcOpts  =
-GhcLibWays    = p
+# perf matches the default settings, repeated here for comparison:
 
+SRC_HC_OPTS     = -O -H64m
+GhcStage1HcOpts = -O -fasm
+GhcStage2HcOpts = -O2 -fasm
+GhcHcOpts       = -Rghc-timing
+GhcLibHcOpts    = -O2 -XGenerics
+GhcLibWays      = p
+
 endif
 
 # -------- A Fast build ------------------------------------------------------
 
 ifeq "$(BuildFlavour)" "quickest"
 
-SRC_HC_OPTS     = -H64m -Onot -fasm
+SRC_HC_OPTS     = -H64m -O0 -fasm
 GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -Onot -fasm
-GhcLibHcOpts    = -Onot -fasm
+GhcStage2HcOpts = -O0 -fasm
+GhcLibHcOpts    = -O0 -fasm
 GhcLibWays      =
 SplitObjs       = NO
 
@@ -53,9 +57,9 @@
 
 ifeq "$(BuildFlavour)" "quick"
 
-SRC_HC_OPTS     = -H64m -Onot -fasm
+SRC_HC_OPTS     = -H64m -O0 -fasm
 GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -Onot -fasm
+GhcStage2HcOpts = -O0 -fasm
 GhcLibHcOpts    = -O -fasm
 GhcLibWays      =
 SplitObjs       = NO