[Pkg-haskell-commits] darcs: ghc: Import of ghc6_6.10.3-3.dsc

[Kari Pahula]

Sat Jun 27 14:58:49 UTC 2009  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.10.3-3.dsc

    M ./changelog +10
    A ./patches/primops_segfault
    M ./patches/series +1
    M ./provided_substvars -2 +2

Sat Jun 27 14:58:49 UTC 2009  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.10.3-3.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2011-01-15 06:06:31.205580229 +0000
+++ new-ghc/changelog	2011-01-15 06:06:31.573599616 +0000
@@ -1,3 +1,13 @@
+ghc6 (6.10.3-3) unstable; urgency=low
+
+  * Patch mkWeakForeignEnv# in rts/PrimOps.cmm to avoid random
+    segfaults. (re:
+    https://bugs.launchpad.net/ubuntu/+source/ghc6/+bug/382803)
+  * Exclude internal boot libraries from generated Provides: libghc6-*
+    substvars. (Closes: #531318)
+
+ -- Kari Pahula <kaol at debian.org>  Sat, 27 Jun 2009 17:58:49 +0300
+
 ghc6 (6.10.3-2) unstable; urgency=low
 
   * Only call ghc-pkg6 in ghc6-doc's trigger if ghc6 is installed.
diff -rN -u old-ghc/patches/primops_segfault new-ghc/patches/primops_segfault
--- old-ghc/patches/primops_segfault	1970-01-01 00:00:00.000000000 +0000
+++ new-ghc/patches/primops_segfault	2011-01-15 06:06:31.561598984 +0000
@@ -0,0 +1,13 @@
+Index: ghc6-6.10.3/rts/PrimOps.cmm
+===================================================================
+--- ghc6-6.10.3.orig/rts/PrimOps.cmm	2009-06-16 04:43:59.000000000 +0300
++++ ghc6-6.10.3/rts/PrimOps.cmm	2009-06-16 04:46:16.000000000 +0300
+@@ -363,7 +363,7 @@
+   flag = R5;
+   eptr = R6;
+ 
+-  ALLOC_PRIM( SIZEOF_StgWeak, R1_PTR & R2_PTR & R3_PTR, mkWeakForeignEnvzh_fast );
++  ALLOC_PRIM( SIZEOF_StgWeak, R1_PTR & R2_PTR, mkWeakForeignEnvzh_fast );
+ 
+   w = Hp - SIZEOF_StgWeak + WDS(1);
+   SET_HDR(w, stg_WEAK_info, W_[CCCS]);
diff -rN -u old-ghc/patches/series new-ghc/patches/series
--- old-ghc/patches/series	2011-01-15 06:06:31.201580018 +0000
+++ new-ghc/patches/series	2011-01-15 06:06:31.561598984 +0000
@@ -3,3 +3,4 @@
 ld-relax-ia64-fix
 ghc_binary_int32
 no_gen_contents_index
+primops_segfault
diff -rN -u old-ghc/provided_substvars new-ghc/provided_substvars
--- old-ghc/provided_substvars	2011-01-15 06:06:31.201580018 +0000
+++ new-ghc/provided_substvars	2011-01-15 06:06:31.561598984 +0000
@@ -6,13 +6,13 @@
 list --global-conf inplace-datadir/package.conf --simple-output |'
     or die "ghc-pkg list failed: $!";
 my @pkgs;
+my @ignored = ('ghc', 'ghc-mtl', 'utf8-string', 'terminfo', 'haskeline');
 while (<PKG>) {
     y/A-Z/a-z/;
     my $pkgstring = $_;
     LOOP: while ($pkgstring =~ m,([^ ]*?)-\d.*? ?,g) {
 	my $pkg = $1;
-	next LOOP if $pkg eq 'ghc';
-	foreach (@pkgs) {
+	foreach (@ignored, @pkgs) {
 	    next LOOP if $_ eq $pkg;
 	}
 	push @pkgs, $1;