Darwin-*-powerpc: rethink about the way to avoid the "ld -r" problem.

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

diff --git a/patches/patch-aa b/patches/patch-aa
index 14b0424f6720df4fe99d2f44faf21dc75ec920cd..9304dc9f4eb7e8a3bf54c7b094a99ab11042dd92 100644 (file)
--- a/patches/patch-aa
+++ b/patches/patch-aa
@@ -1,15 +1,73 @@
 $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-10-05 12:46:12.000000000 +0000
++++ libraries/integer-gmp/configure
+@@ -2961,68 +2961,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*)
+-    { echo "$as_me:$LINENO: checking for GMP.framework" >&5
+-echo $ECHO_N "checking for GMP.framework... $ECHO_C" >&6; }
+-    save_libs="$LIBS"
+-    LIBS="-framework GMP"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* 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
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-       test -z "$ac_c_werror_flag" ||
+-       test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  HaveFrameworkGMP=YES; GMP_FRAMEWORK=GMP; GMP_LIBS=
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-      HaveFrameworkGMP=NO
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-    LIBS="$save_libs"
+-    { echo "$as_me:$LINENO: result: $HaveFrameworkGMP" >&5
+-echo "${ECHO_T}$HaveFrameworkGMP" >&6; }
+-    ;;
+-esac
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'