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

diff --git a/patches/patch-aa b/patches/patch-aa
index e517d8c..99bbc74 100644
--- a/patches/patch-aa
+++ b/patches/patch-aa
@@ -1,13 +1,47 @@
-$NetBSD: patch-aa,v 1.8 2007/03/24 17:57:20 kristerw Exp $
+$NetBSD$
 
---- ../ghc-6.4.2/ghc/Makefile.orig	2006-07-30 14:26:56.000000000 +0200
-+++ ../ghc-6.4.2/ghc/Makefile	2006-07-30 14:27:26.000000000 +0200
-@@ -22,7 +22,7 @@
- # we descend into subdirs - to boot utils must be before driver.
- #
- ifeq "$(BootingFromHc)" "YES"
--SUBDIRS = includes rts docs compiler lib utils driver
-+SUBDIRS = includes rts docs lib compiler utils driver
- else
- ifneq "$(ILXized)" "YES"
- SUBDIRS = includes lib utils driver docs compiler rts
+--- libraries/integer-gmp/configure.orig	2010-11-12 18:10:51.000000000 +0000
++++ libraries/integer-gmp/configure
+@@ -3070,42 +3070,6 @@ fi
+ fi
+ 
+ 
+-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'