7.0.1 for powerpc-apple-darwin (but crashes on --interactive)

[pkgsrc-ghc.git] / patches / patch-ab

diff --git a/patches/patch-ab b/patches/patch-ab
index 61832c8e91af9954384aa60be503801959747e56..864fccc4f12b8e753770e83cc1d916ce12e9bd9d 100644 (file)
--- a/patches/patch-ab
+++ b/patches/patch-ab
@@ -1,29 +1,29 @@
 $NetBSD$
 
---- ../ghc-6.6.1/configure.orig        2007-04-26 02:29:16.000000000 +0900
-+++ ../ghc-6.6.1/configure
-@@ -2590,20 +2590,12 @@ fi
-       exit 1
-    else
-    $PerlCmd -v >conftest.out 2>&1
--   if grep "v5.6" conftest.out >/dev/null 2>&1; then
-+   if grep "v5." conftest.out >/dev/null 2>&1; then
-       :
-    else
--      if grep "v5.8" conftest.out >/dev/null 2>&1; then
--         :
--      else
--         if grep "version 6" conftest.out >/dev/null 2>&1; then
--            :
--         else
--            { { echo "$as_me:$LINENO: error: your version of perl probably won't work, try upgrading it." >&5
--echo "$as_me: error: your version of perl probably won't work, try upgrading it." >&2;}
--   { (exit 1); exit 1; }; }
--         fi
--      fi
-+      { { echo "$as_me:$LINENO: error: your version of perl probably won't work, try upgrading it." >&5
-+          echo "$as_me: error: your version of perl probably won't work, try upgrading it." >&2; }
-+        { (exit 1); exit 1; }; }
-    fi
- rm -fr conftest*
+--- configure.orig     2010-11-12 18:10:41.000000000 +0000
++++ configure
+@@ -6181,7 +6181,7 @@ fi
+ 
+ 
+ if test -n "$DtraceCmd"; then
+-  if test "x$TargetOS_CPP-$TargetVendor_CPP" == "xdarwin-apple"; then
++  if test "x$TargetOS_CPP-$TargetVendor_CPP" = "xdarwin-apple"; then
+     HaveDtrace=YES
+   fi
+ fi
+@@ -6507,6 +6507,7 @@ $as_echo "$as_me: WARNING: cannot find h
+ fi
+ 
+ 
++if test "$BootingFromHc" = "NO"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ghc-pkg matching $WithGhc" >&5
+ $as_echo_n "checking for ghc-pkg matching $WithGhc... " >&6; }
+ if test "${fp_cv_matching_ghc_pkg+set}" = set; then :
+@@ -6528,6 +6529,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fp_cv_matching_ghc_pkg" >&5
+ $as_echo "$fp_cv_matching_ghc_pkg" >&6; }
+ GhcPkgCmd=$fp_cv_matching_ghc_pkg
++fi
+ 
+