X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=patches%2Fpatch-ab;h=864fccc4f12b8e753770e83cc1d916ce12e9bd9d;hb=8fa3d45608aad3bebde37f7bdb182c25cbf63715;hp=4bed7ba1a81768fc1cb7b4e9ae8929d6aff5c912;hpb=ce139a0445754a5ef695190b91f2d6d3d815869f;p=pkgsrc-ghc.git

diff --git a/patches/patch-ab b/patches/patch-ab
index 4bed7ba..864fccc 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
+--- configure.orig	2010-11-12 18:10:41.000000000 +0000
++++ configure
+@@ -6181,7 +6181,7 @@ fi
  
- 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 =
+ 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
+ 
  
- 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)