X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=patches%2Fpatch-ab;h=61832c8e91af9954384aa60be503801959747e56;hb=4d85817f3a37aa9d705440652f3c21ec00e5ee1e;hp=4bed7ba1a81768fc1cb7b4e9ae8929d6aff5c912;hpb=ce139a0445754a5ef695190b91f2d6d3d815869f;p=pkgsrc-ghc.git

diff --git a/patches/patch-ab b/patches/patch-ab
index 4bed7ba..61832c8 100644
--- a/patches/patch-ab
+++ b/patches/patch-ab
@@ -1,21 +1,29 @@
-$NetBSD: patch-ab,v 1.8 2007/03/24 17:57:20 kristerw Exp $
+$NetBSD$
 
---- ../ghc-6.4.2/mk/bootstrap.mk.orig	2005-05-10 19:42:19.000000000 +0900
-+++ ../ghc-6.4.2/mk/bootstrap.mk
-@@ -37,7 +37,6 @@ PLATFORM_CC_OPTS += -static -D_HPUX_SOUR
- endif
+--- ../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*
  
- ifeq "$(powerpc_TARGET_ARCH)" "1"
--PLATFORM_CC_OPTS += -static
- PLATFORM_HC_BOOT_CC_OPTS += -finhibit-size-directive
- endif
- 
-@@ -146,7 +145,7 @@ HC_BOOT_LD_OPTS += \
- HC_BOOT_LIBS =
- 
- ifeq "$(GhcWithInterpreter)" "YES"
--HC_BOOT_LIBS += -lHSreadline -lHStemplate-haskell -lHSunix -lHSunix_cbits
-+HC_BOOT_LIBS += -lHStemplate-haskell -lHSunix -lHSunix_cbits
- endif
- 
- HC_BOOT_LIBS +=  -lHSCabal -lHShaskell98 -lHSbase -lHSbase_cbits -lHSparsec -lHSrts -lgmp -lm $(EXTRA_HC_BOOT_LIBS)