[arch-commits] Commit in ghc/trunk (PKGBUILD build.mk silence-gen_contents_index.diff)
Thomas Dziedzic
tdziedzic at archlinux.org
Fri Sep 7 04:40:22 UTC 2012
Date: Friday, September 7, 2012 @ 00:40:21
Author: tdziedzic
Revision: 166370
bump
Modified:
ghc/trunk/PKGBUILD
ghc/trunk/build.mk
Deleted:
ghc/trunk/silence-gen_contents_index.diff
---------------------------------+
PKGBUILD | 107 +++++++++++++++++---------------------
build.mk | 27 +++++++++
silence-gen_contents_index.diff | 10 ---
3 files changed, 76 insertions(+), 68 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-09-07 01:16:18 UTC (rev 166369)
+++ PKGBUILD 2012-09-07 04:40:21 UTC (rev 166370)
@@ -7,7 +7,7 @@
# This implies that all libraries need to be rebuilt when ghc is rebuilt.
pkgname=ghc
-pkgver=7.4.2
+pkgver=7.6.1
pkgrel=1
pkgdesc='The Glasgow Haskell Compiler'
arch=('i686' 'x86_64')
@@ -21,72 +21,62 @@
# keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this...
#options=('!makeflags')
# missing rtl?
-provides=('haskell-array=0.4.0.0'
- 'haskell-base=4.5.1.0'
- 'haskell-binary=0.5.1.0'
+provides=('haskell-array=0.4.0.1'
+ 'haskell-base=4.6.0.0'
+ 'haskell-binary=0.5.1.1'
'haskell-bin-package-db=0.0.0.0'
- 'haskell-bytestring=0.9.2.1'
- 'haskell-containers=0.4.2.1'
- 'haskell-deepseq=1.3.0.0'
- 'haskell-directory=1.1.0.2'
- 'haskell-extensible-exceptions=0.1.1.4'
- 'haskell-filepath=1.3.0.0'
- 'haskell-ghc-prim=0.2.0.0'
- 'haskell-haskell2010=1.1.0.1'
- 'haskell-haskell98=2.0.0.1'
- 'haskell-hoopl=3.8.7.3'
- 'haskell-hpc=0.5.1.1'
- 'haskell-integer-gmp=0.4.0.0'
- 'haskell-old-locale=1.0.0.4'
- 'haskell-old-time=1.1.0.0'
+ 'haskell-bytestring=0.10.0.0'
+ 'haskell-containers=0.5.0.0'
+ 'haskell-deepseq=1.3.0.1'
+ 'haskell-directory=1.2.0.0'
+ 'haskell-filepath=1.3.0.1'
+ 'haskell-ghc-prim=0.3.0.0'
+ 'haskell-haskell2010=1.1.1.0'
+ 'haskell-haskell98=2.0.0.2'
+ 'haskell-hoopl=3.9.0.0'
+ 'haskell-hpc=0.6.0.0'
+ 'haskell-integer-gmp=0.5.0.0'
+ 'haskell-old-locale=1.0.0.5'
+ 'haskell-old-time=1.1.0.1'
'haskell-pretty=1.1.1.0'
- 'haskell-process=1.1.0.1'
- 'haskell-template-haskell=2.7.0.0'
- 'haskell-time=1.4'
- 'haskell-unix=2.5.1.1'
- 'haskell-cabal=1.14.0'
- )
-replaces=('haskell-array<0.4.0.0'
- 'haskell-base<4.5.1.0'
- 'haskell-binary<0.5.1.0'
+ 'haskell-process=1.1.0.2'
+ 'haskell-template-haskell=2.8.0.0'
+ 'haskell-time=1.4.0.1'
+ 'haskell-unix=2.6.0.0'
+ 'haskell-cabal=1.16.0')
+replaces=('haskell-array<0.4.0.1'
+ 'haskell-base<4.6.0.0'
+ 'haskell-binary<0.5.1.1'
'haskell-bin-package-db<0.0.0.0'
- 'haskell-bytestring<0.9.2.1'
- 'haskell-containers<0.4.2.1'
- 'haskell-deepseq<1.3.0.0'
- 'haskell-directory<1.1.0.2'
- 'haskell-extensible-exceptions<0.1.1.4'
- 'haskell-filepath<1.3.0.0'
- 'haskell-ghc-prim<0.2.0.0'
- 'haskell-haskell2010<1.1.0.1'
- 'haskell-haskell98<2.0.0.1'
- 'haskell-hoopl<3.8.7.3'
- 'haskell-hpc<0.5.1.1'
- 'haskell-integer-gmp<0.4.0.0'
- 'haskell-old-locale<1.0.0.4'
- 'haskell-old-time<1.1.0.0'
+ 'haskell-bytestring<0.10.0.0'
+ 'haskell-containers<0.5.0.0'
+ 'haskell-deepseq<1.3.0.1'
+ 'haskell-directory<1.2.0.0'
+ 'haskell-filepath<1.3.0.1'
+ 'haskell-ghc-prim<0.3.0.0'
+ 'haskell-haskell2010<1.1.1.0'
+ 'haskell-haskell98<2.0.0.2'
+ 'haskell-hoopl<3.9.0.0'
+ 'haskell-hpc<0.6.0.0'
+ 'haskell-integer-gmp<0.5.0.0'
+ 'haskell-old-locale<1.0.0.5'
+ 'haskell-old-time<1.1.0.1'
'haskell-pretty<1.1.1.0'
- 'haskell-process<1.1.0.1'
- 'haskell-template-haskell<2.7.0.0'
- 'haskell-time<1.4'
- 'haskell-unix<2.5.1.1'
- 'haskell-cabal<1.14.0'
- )
+ 'haskell-process<1.1.0.2'
+ 'haskell-template-haskell<2.8.0.0'
+ 'haskell-time<1.4.0.1'
+ 'haskell-unix<2.6.0.0'
+ 'haskell-cabal<1.16.0')
source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2"
"http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2"
- 'build.mk'
- 'silence-gen_contents_index.diff')
-md5sums=('267462db5c5a7c245fb26361b77007c4'
- '528005749c761fe6c12a0079bd84fb90'
- '88ad4108c26f56fc38466d82aaf9a295'
- '2ac480d025b706fc47acc58c54b246bb')
+ 'build.mk')
+md5sums=('e9d892d2970550ec5e70130b3621f6b6'
+ '0d93c458e3b445a7e524ef6ae459ce11'
+ 'c367ef26300648ee9b8aca3dee5c9669')
build() {
cd ghc-${pkgver}
- # Silence gen_contents_index for the common case.
- # http://hackage.haskell.org/trac/ghc/ticket/5992
- patch -Np1 -i ${srcdir}/silence-gen_contents_index.diff
-
cp ${srcdir}/build.mk mk/build.mk
./configure \
@@ -96,6 +86,9 @@
}
check() {
+ # keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this...
+ unset MAKEFLAGS
+
cd ghc-${pkgver}
# python2 rename
Modified: build.mk
===================================================================
--- build.mk 2012-09-07 01:16:18 UTC (rev 166369)
+++ build.mk 2012-09-07 04:40:21 UTC (rev 166370)
@@ -10,6 +10,9 @@
# Full build with max optimisation and everything enabled (very slow build)
BuildFlavour = perf
+# As above but build GHC using the LLVM backend
+#BuildFlavour = perf-llvm
+
# Fast build with optimised libraries, no profiling (RECOMMENDED):
#BuildFlavour = quick
@@ -51,6 +54,23 @@
endif
+# ---------------- Perf build using LLVM -------------------------------------
+
+ifeq "$(BuildFlavour)" "perf-llvm"
+
+SRC_HC_OPTS = -O -H64m -fllvm
+GhcStage1HcOpts = -O -fllvm
+GhcStage2HcOpts = -O2 -fllvm
+GhcHcOpts = -Rghc-timing
+GhcLibHcOpts = -O2
+GhcLibWays += p
+
+ifeq "$(PlatformSupportsSharedLibs)" "YES"
+GhcLibWays += dyn
+endif
+
+endif
+
# -------- A Fast build ------------------------------------------------------
ifeq "$(BuildFlavour)" "quickest"
@@ -151,10 +171,14 @@
ifeq "$(BuildFlavour)" "unreg"
+# Note that the LLVM backend works in unregisterised mode as well as
+# registerised mode. This often makes it a good choice for porting
+# GHC.
+
GhcUnregisterised = YES
GhcWithNativeCodeGen = NO
-SRC_HC_OPTS = -O -H64m
+SRC_HC_OPTS = -O -H64m # -fllvm
GhcStage1HcOpts = -O
GhcStage2HcOpts = -O2
GhcHcOpts = -Rghc-timing
@@ -173,3 +197,4 @@
# NoFib settings
NoFibWays =
STRIP_CMD = :
+
Deleted: silence-gen_contents_index.diff
===================================================================
--- silence-gen_contents_index.diff 2012-09-07 01:16:18 UTC (rev 166369)
+++ silence-gen_contents_index.diff 2012-09-07 04:40:21 UTC (rev 166370)
@@ -1,10 +0,0 @@
---- ghc-7.4.2/libraries/gen_contents_index.original 2012-06-10 22:23:28.810059378 +0000
-+++ ghc-7.4.2/libraries/gen_contents_index 2012-06-10 22:24:00.289814576 +0000
-@@ -47,7 +47,6 @@
- esac
-
- # Now create the combined contents and index pages
--echo $HADDOCK_ARGS
- $HADDOCK --gen-index --gen-contents -o . \
- -t "Haskell Hierarchical Libraries" \
- -p "prologue.txt" \
More information about the arch-commits
mailing list