X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=patches%2Fpatch-aa;h=99bbc74402e71154f02f1800568995c32f09898b;hb=8fa3d45608aad3bebde37f7bdb182c25cbf63715;hp=14b0424f6720df4fe99d2f44faf21dc75ec920cd;hpb=581794b5a3b8c50fa6fe25325b8c59a96a89fa41;p=pkgsrc-ghc.git

diff --git a/patches/patch-aa b/patches/patch-aa
index 14b0424..99bbc74 100644
--- a/patches/patch-aa
+++ b/patches/patch-aa
@@ -1,15 +1,47 @@
 $NetBSD$
 
---- rts/ghc.mk.orig	2009-12-11 03:11:33.000000000 +0900
-+++ rts/ghc.mk
-@@ -19,8 +19,8 @@ rts_dist_HC = $(GHC_STAGE1)
- # merge GhcLibWays and GhcRTSWays but strip out duplicates
- rts_WAYS = $(GhcLibWays) $(filter-out $(GhcLibWays),$(GhcRTSWays))
+--- libraries/integer-gmp/configure.orig	2010-11-12 18:10:51.000000000 +0000
++++ libraries/integer-gmp/configure
+@@ -3070,42 +3070,6 @@ fi
+ fi
  
--ALL_RTS_LIBS = $(foreach way,$(rts_WAYS),rts/dist/build/libHSrts$($(way)_libsuf)) \
--	       rts/dist/build/libHSrtsmain.a
-+ALL_RTS_LIBS = rts/dist/build/libHSrtsmain.a $(foreach way,$(rts_WAYS),rts/dist/build/libHSrts$($(way)_libsuf))
-+
- all_rts : $(ALL_RTS_LIBS)
  
- # -----------------------------------------------------------------------------
+-case $target_os in
+-  darwin*)
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMP.framework" >&5
+-$as_echo_n "checking for GMP.framework... " >&6; }
+-    save_libs="$LIBS"
+-    LIBS="-framework GMP"
+-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char __gmpz_fdiv_qr ();
+-int
+-main ()
+-{
+-return __gmpz_fdiv_qr ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  HaveFrameworkGMP=YES; GMP_FRAMEWORK=GMP; GMP_LIBS=
+-else
+-  HaveFrameworkGMP=NO
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-    LIBS="$save_libs"
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HaveFrameworkGMP" >&5
+-$as_echo "$HaveFrameworkGMP" >&6; }
+-    ;;
+-esac
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'