[Pkg-haskell-commits] darcs: ghc: Import of ghc6_6.12.1-12.dsc

[Kari Pahula]

Mon Feb 22 13:08:48 UTC 2010  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.12.1-12.dsc

    M ./changelog -1 +9
    M ./ghc6.postinst.in -1 +1
    M ./patches/kfreebsd-_gnu_source-565818 -2 +2
    M ./rules -1 +6

Mon Feb 22 13:08:48 UTC 2010  Kari Pahula <kaol at debian.org>
  * Import of ghc6_6.12.1-12.dsc
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2011-01-15 06:07:47.293587738 +0000
+++ new-ghc/changelog	2011-01-15 06:07:47.345590477 +0000
@@ -1,6 +1,14 @@
+ghc6 (6.12.1-12) unstable; urgency=low
+
+  * Fix the kfreebsd-* patch.
+  * Don't die in ghc6's trigger if ghc-pkg check fails.  (Closes: #570921)
+  * Recognise DEB_BUILD_OPTIONS=parallel.
+
+ -- Kari Pahula <kaol at debian.org>  Mon, 22 Feb 2010 15:08:48 +0200
+
 ghc6 (6.12.1-11) unstable; urgency=low
 
-  * Add "unset LC_ALL\export LC_CTYPE=en_US" to bin/ghc wrapper on ia64.
+  * Add "unset LC_ALL\nexport LC_CTYPE=en_US" to bin/ghc wrapper on ia64.
   * Actually append GhcWithInterpreter=YES to mk/build.mk on kfreebsd-*,
     don't just echo it to stdout.
 
diff -rN -u old-ghc/ghc6.postinst.in new-ghc/ghc6.postinst.in
--- old-ghc/ghc6.postinst.in	2011-01-15 06:07:47.293587738 +0000
+++ new-ghc/ghc6.postinst.in	2011-01-15 06:07:47.345590477 +0000
@@ -59,7 +59,7 @@
     ;;
     triggered)
 	$bindir/ghc-pkg recache
-	$bindir/ghc-pkg check
+	$bindir/ghc-pkg check || true
 	;;
     *)
         echo "postinst called with unknown argument \`$1'" >&2
diff -rN -u old-ghc/patches/kfreebsd-_gnu_source-565818 new-ghc/patches/kfreebsd-_gnu_source-565818
--- old-ghc/patches/kfreebsd-_gnu_source-565818	2011-01-15 06:07:47.293587738 +0000
+++ new-ghc/patches/kfreebsd-_gnu_source-565818	2011-01-15 06:07:47.333589845 +0000
@@ -18,13 +18,13 @@
 Index: ghc6-6.12.1/driver/mangler/ghc-asm.lprl
 ===================================================================
 --- ghc6-6.12.1.orig/driver/mangler/ghc-asm.lprl	2010-02-05 11:53:12.000000000 +0200
-+++ ghc6-6.12.1/driver/mangler/ghc-asm.lprl	2010-02-05 11:53:48.000000000 +0200
++++ ghc6-6.12.1/driver/mangler/ghc-asm.lprl	2010-02-22 14:45:07.000000000 +0200
 @@ -216,7 +216,7 @@
      $T_HDR_vector   = "\.text\n\t\.align 8\n";
  
      #--------------------------------------------------------#
 -    } elsif ( $TargetPlatform =~ /^x86_64-.*-(linux|openbsd|freebsd|dragonfly|netbsd)$/m ) {
-+    } elsif ( $TargetPlatform =~ /^x86_64-.*-(linux|openbsd|freebsd|dragonfly|netbsd|kfreebsd)$/m ) {
++    } elsif ( $TargetPlatform =~ /^x86_64-.*-(linux|openbsd|freebsd|dragonfly|netbsd|kfreebsdgnu)$/m ) {
  
      $T_STABBY       = 0; # 1 iff .stab things (usually if a.out format)
      $T_US           = ''; # _ if symbols have an underscore on the front
diff -rN -u old-ghc/rules new-ghc/rules
--- old-ghc/rules	2011-01-15 06:07:47.293587738 +0000
+++ new-ghc/rules	2011-01-15 06:07:47.341590266 +0000
@@ -26,6 +26,11 @@
 EXTRA_CONFIGURE_FLAGS=--with-ghc="$(GHC)"
 BUILD_HADDOCK_DOCS=YES
 
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    MAKEFLAGS += -j$(NUMJOBS)
+endif
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -98,7 +103,7 @@
 build-stamp: configure-stamp
 	dh_testdir
 	sh debian/watcher.sh "$$PPID" "`pwd`" "`pwd`/build-stamp" 'ghc\|gcc' &
-	$(MAKE)
+	$(MAKE) $(MAKEFLAGS)
 
 	# Do some very simple tests that the compiler actually works
 	rm -rf debian/testghc