[Pkg-haskell-commits] darcs: ghc: Drop configure-s390x (applied upstream)

[Joachim Breitner]

Wed Dec 21 18:53:44 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Drop configure-s390x (applied upstream)
  Ignore-this: 48e7e7b5e4a614bfb00f1e711860f54b

    R ./patches/configure-s390x
    M ./patches/series -1

Wed Dec 21 18:53:44 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Drop configure-s390x (applied upstream)
  Ignore-this: 48e7e7b5e4a614bfb00f1e711860f54b
diff -rN -u old-ghc//patches/configure-s390x new-ghc//patches/configure-s390x
--- old-ghc//patches/configure-s390x	2012-02-03 16:39:53.715248618 +0000
+++ new-ghc//patches/configure-s390x	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-From 3a49e5147822bdfea2c763c863a7ca6b6baee609 Mon Sep 17 00:00:00 2001
-From: Joachim Breitner <mail at joachim-breitner.de>
-Date: Mon, 5 Sep 2011 09:37:24 +0200
-Subject: [PATCH] Add s390x to list of supported architectures
-
----
- aclocal.m4   |    3 +++
- configure.ac |    2 +-
- 2 files changed, 4 insertions(+), 1 deletions(-)
-
-Index: ghc-7.2.2/aclocal.m4
-===================================================================
---- ghc-7.2.2.orig/aclocal.m4	2011-11-19 18:27:24.000000000 +0100
-+++ ghc-7.2.2/aclocal.m4	2011-11-19 18:27:26.000000000 +0100
-@@ -1493,6 +1493,9 @@
-   rs6000)
-     $2="rs6000"
-     ;;
-+  s390x*)
-+    $2="s390x"
-+    ;;
-   s390*)
-     $2="s390"
-     ;;
-Index: ghc-7.2.2/configure.ac
-===================================================================
---- ghc-7.2.2.orig/configure.ac	2011-11-09 19:10:39.000000000 +0100
-+++ ghc-7.2.2/configure.ac	2011-11-19 18:27:26.000000000 +0100
-@@ -224,7 +224,7 @@
- 
- checkArch() {
-     case $1 in
--    alpha|arm|hppa|hppa1_1|i386|ia64|m68k|mips|mipseb|mipsel|powerpc|powerpc64|rs6000|s390|sparc|sparc64|vax|x86_64)
-+    alpha|arm|hppa|hppa1_1|i386|ia64|m68k|mips|mipseb|mipsel|powerpc|powerpc64|rs6000|s390|s390x|sparc|sparc64|vax|x86_64)
-         ;;
-     *)
-         echo "Unknown arch $1"
diff -rN -u old-ghc//patches/series new-ghc//patches/series
--- old-ghc//patches/series	2012-02-03 16:39:53.711248722 +0000
+++ new-ghc//patches/series	2012-02-03 16:39:54.767248784 +0000
@@ -3,6 +3,5 @@
 use-debian-gen_contents_index
 haddock-no-library
 lpthread-bootstrap-workaround
-configure-s390x
 haddock-expose-interface-version
 no_ghci_on_powerpc