Update ghc to version 6.8.2.

The major changes in this release are adding Haskell Program Coverage (hpc)
support to the compiler, adding a debugger to GHCi, the first phase of the
base package split, and pointer tagging in the code generator (which should
mean most code improves by 10-15%, and as a result the compiler is also
faster).

Most of this upgrade was done by Paulo Matias in pkgsrc-wip.
This commit is contained in:
kristerw 2008-03-17 15:33:10 +00:00
parent ff8eb104f2
commit 722ad1956b
6 changed files with 1280 additions and 991 deletions

View file

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.38 2007/08/18 23:39:26 rillig Exp $
# $NetBSD: Makefile,v 1.39 2008/03/17 15:33:10 kristerw Exp $
DISTNAME= ghc-6.6.1
DISTNAME= ghc-6.8.2
CATEGORIES= lang
MASTER_SITES= http://www.haskell.org/ghc/dist/6.6.1/
DISTFILES= ghc-6.6.1-src.tar.bz2 \
ghc-6.6.1-src-extralibs.tar.bz2 \
MASTER_SITES= http://www.haskell.org/ghc/dist/6.8.2/
DISTFILES= ghc-6.8.2-src.tar.bz2 \
ghc-6.8.2-src-extralibs.tar.bz2 \
ghc-6.4.2-src.tar.bz2 \
ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz
@ -30,11 +30,12 @@ USE_TOOLS+= gmake perl:run
SUBST_CLASSES+= prefix
SUBST_STAGE.prefix= post-patch
SUBST_FILES.prefix= libraries/readline/package.conf.in
SUBST_FILES.prefix+= rts/package.conf.in
SUBST_FILES.prefix+= ../ghc-6.4.2/mk/bootstrap.mk
SUBST_FILES.prefix+= ../ghc-6.4.2/ghc/rts/package.conf.in
SUBST_FILES.prefix+= ../ghc-6.4.2/libraries/readline/package.conf.in
SUBST_FILES.prefix+= libraries/readline/configure
SUBST_FILES.prefix+= libraries/readline/readline.cabal
SUBST_FILES.prefix+= rts/package.conf.in
SUBST_SED.prefix= -e 's,@PREFIX@,${PREFIX},g'
pre-configure:

File diff suppressed because it is too large Load diff

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.18 2007/04/29 22:12:02 kristerw Exp $
$NetBSD: distinfo,v 1.19 2008/03/17 15:33:10 kristerw Exp $
SHA1 (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 29c1a17a83ec0ddec8ff231e009c740ebc61dd6c
RMD160 (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 5ce775a19797fe257357fedd33db2354dd50d2de
@ -6,17 +6,18 @@ Size (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 9927295 bytes
SHA1 (ghc-6.4.2-src.tar.bz2) = 60bcea323f851caa84d49c7731b86164d5cefa42
RMD160 (ghc-6.4.2-src.tar.bz2) = 19943eb2673e663973e64739cdf23720b6f36d38
Size (ghc-6.4.2-src.tar.bz2) = 6954958 bytes
SHA1 (ghc-6.6.1-src-extralibs.tar.bz2) = 1398f6c35191d52410a2e066b382635dff0d8d6d
RMD160 (ghc-6.6.1-src-extralibs.tar.bz2) = 1c18c85d978c4b3369132e247c823aaa90ea8530
Size (ghc-6.6.1-src-extralibs.tar.bz2) = 1928527 bytes
SHA1 (ghc-6.6.1-src.tar.bz2) = eaa385f68ffe7806c4145e2944c3e4216d01f160
RMD160 (ghc-6.6.1-src.tar.bz2) = 30cc43ad30b545228cb303b17be59d632856333e
Size (ghc-6.6.1-src.tar.bz2) = 4340777 bytes
SHA1 (ghc-6.8.2-src-extralibs.tar.bz2) = b8c9ff989a87e2699a08e595523faa8d11e6e7dc
RMD160 (ghc-6.8.2-src-extralibs.tar.bz2) = 10e888cb4cf8a05b1213b171877f63505ff30cdf
Size (ghc-6.8.2-src-extralibs.tar.bz2) = 1919843 bytes
SHA1 (ghc-6.8.2-src.tar.bz2) = 1f40b0ee2e51be1208fdb579ce4998181ec36a40
RMD160 (ghc-6.8.2-src.tar.bz2) = dc555c3137d9314a6ee6a0b7ad62c0ba16d9d52c
Size (ghc-6.8.2-src.tar.bz2) = 7072545 bytes
SHA1 (patch-aa) = bcb07fa1a18edddf1629705a9c1557b0489f6d63
SHA1 (patch-ab) = 488385a706126efa4bf9453bb491728e1b1b4051
SHA1 (patch-ac) = 07415eb0df840cb10e0d7c33c2dc365349b7e67a
SHA1 (patch-ad) = 40252f691cc920ba7684d24f4a9599b4fc40243d
SHA1 (patch-ac) = 76029bb1d2dd549762cea0b3817993d47374d7aa
SHA1 (patch-ad) = b9ad9a80327c5fb50e2029e07fae189256e74132
SHA1 (patch-af) = 5721e7653cbc2274db147540b4055e8007662abb
SHA1 (patch-ag) = 174ded35ea9e41d6c10722edde82d0198e61c77e
SHA1 (patch-ah) = 12ca06285033d5b45df5ff72b6718869920323ad
SHA1 (patch-ai) = f157d50386ce8fd032d6f19d1f0b6fbb7baa6269
SHA1 (patch-aj) = 26019891c21907c9c26a7bc21d655172528cfbaa

View file

@ -1,8 +1,8 @@
$NetBSD: patch-ac,v 1.6 2007/03/24 17:57:20 kristerw Exp $
$NetBSD: patch-ac,v 1.7 2008/03/17 15:33:10 kristerw Exp $
--- rts/package.conf.in.orig 2007-02-25 00:05:44.000000000 +0100
+++ rts/package.conf.in 2007-02-25 00:06:23.000000000 +0100
@@ -68,7 +68,7 @@
--- rts/package.conf.in.orig 2007-12-10 16:11:32.000000000 -0200
+++ rts/package.conf.in
@@ -73,7 +73,7 @@ depends:
hugs-options:
cc-options:

View file

@ -1,13 +1,9 @@
$NetBSD: patch-ad,v 1.8 2007/03/24 17:57:20 kristerw Exp $
$NetBSD: patch-ad,v 1.9 2008/03/17 15:33:10 kristerw Exp $
--- libraries/readline/package.conf.in.orig 2007-02-25 00:07:25.000000000 +0100
+++ libraries/readline/package.conf.in 2007-02-25 00:07:47.000000000 +0100
@@ -27,7 +27,7 @@
depends: base
hugs-options:
cc-options:
-ld-options:
+ld-options: "-Wl","-R@PREFIX@/lib","-L","@PREFIX@/lib"
framework-dirs:
frameworks:
haddock-interfaces: HADDOCK_IFACE
--- libraries/readline/readline.cabal.orig 2007-12-10 16:20:29.000000000 -0200
+++ libraries/readline/readline.cabal
@@ -32,3 +32,4 @@ library
includes: HsReadline.h
install-includes: HsReadline.h HsReadlineConfig.h
c-sources: HsReadline_cbits.c
+ ld-options: "-Wl","-R@PREFIX@/lib","-L","@PREFIX@/lib"

15
lang/ghc/patches/patch-aj Normal file
View file

@ -0,0 +1,15 @@
$NetBSD: patch-aj,v 1.3 2008/03/17 15:33:10 kristerw Exp $
--- libraries/readline/configure.orig 2008-02-21 09:32:21.000000000 -0300
+++ libraries/readline/configure
@@ -1300,6 +1300,10 @@ else
readline_libraries=NONE
fi;
+# Force readline paths.
+readline_includes="@PREFIX@/include"
+readline_libraries="@PREFIX@/lib"
+
if test "$enable_readline" = no; then
BUILD_PACKAGE_BOOL=False