TODO fix

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

diff --git a/patches/patch-ab b/patches/patch-ab
index 61832c8e91af9954384aa60be503801959747e56..148725673132a23ac817d3564d5d6a7849c12e1f 100644 (file)
--- a/patches/patch-ab
+++ b/patches/patch-ab
@@ -1,29 +1,14 @@
 $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*
+--- rules/build-package-way.mk.orig    2010-10-05 12:43:54.000000000 +0000
++++ rules/build-package-way.mk
+@@ -84,7 +84,8 @@ ifneq "$4" "0"
+ BINDIST_LIBS += $$($1_$2_GHCI_LIB)
+ endif
+ $$($1_$2_GHCI_LIB) : $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) $$($1_$2_EXTRA_OBJS)
+-      "$$(LD)" -r -o $$@ $$(EXTRA_LD_OPTS) $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) `$$($1_$2_$3_MKSTUBOBJS)` $$($1_$2_EXTRA_OBJS)
++      "$$(LD)" -r -o $$@ $$(EXTRA_LD_OPTS) $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) `$$($1_$2_$3_MKSTUBOBJS)` $$($1_$2_EXTRA_OBJS) \
++              || (touch empty.c && $$(CC) -o $$@ -c empty.c)
  
+ $(call all-target,$1_$2,$$($1_$2_GHCI_LIB))
+ endif