From 7f67bcc26fb28c6b712b7619a605769c77af9fab Mon Sep 17 00:00:00 2001 From: PHO Date: Wed, 24 Nov 2010 21:20:05 +0900 Subject: [PATCH] 7.0.1 for powerpc-apple-darwin (still crashes on --interactive) --- Makefile | 8 ++++---- distinfo | 2 +- patches/patch-al | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 2a0cbfb..04bc5ca 100644 --- a/Makefile +++ b/Makefile @@ -173,10 +173,10 @@ do-configure: ${RUN} ${ECHO} "HSCOLOUR_SRCS = NO" >> ${WRKSRC}/mk/build.mk # To avoid powerpc crash... # See http://hackage.haskell.org/trac/ghc/ticket/4034 -.if ${MACHINE_ARCH} == "powerpc" && ${OPSYS} == "Darwin" - ${RUN} ${ECHO} "GhcRtsHcOpts = -optc-O0 -optc-g" >> ${WRKSRC}/mk/build.mk - ${RUN} ${ECHO} "GhcRtsCcOpts = -O0 -g" >> ${WRKSRC}/mk/build.mk -.endif +#.if ${MACHINE_ARCH} == "powerpc" && ${OPSYS} == "Darwin" +# ${RUN} ${ECHO} "GhcRtsHcOpts = -optc-O0 -optc-g" >> ${WRKSRC}/mk/build.mk +# ${RUN} ${ECHO} "GhcRtsCcOpts = -O0 -g" >> ${WRKSRC}/mk/build.mk +#.endif # Some unused scripts don't pass the portability test. CHECK_PORTABILITY_SKIP+= distrib/prep-bin-dist-mingw diff --git a/distinfo b/distinfo index 5499cbe..0392fe4 100644 --- a/distinfo +++ b/distinfo @@ -11,4 +11,4 @@ SHA1 (patch-ab) = cb46e6599a512a1f9a1311cebc15865d123a961f SHA1 (patch-ac) = d3bd1c6c8ac7d8271aa9584579353a5bed93a277 SHA1 (patch-ah) = 1c9a8941856921b740da1e46d6942460b55033c5 SHA1 (patch-aj) = 3fe647fd631baef37b0b5bcc9d06eef9afd08648 -SHA1 (patch-al) = 029726b76619a3059671ef6090cffcdb5612788a +SHA1 (patch-al) = b1b0a60597091bb5a9f26bfa0674cb10c1a3b857 diff --git a/patches/patch-al b/patches/patch-al index 155bfe4..ef8689b 100644 --- a/patches/patch-al +++ b/patches/patch-al @@ -1,6 +1,6 @@ $NetBSD$ ---- rts/ghc.mk.orig 2010-11-23 11:49:14.000000000 +0000 +--- rts/ghc.mk.orig 2010-11-12 18:10:06.000000000 +0000 +++ rts/ghc.mk @@ -425,12 +425,14 @@ rts_dist_MKDEPENDC_OPTS += -DPROFILING - ifeq "$(HaveDtrace)" "YES" @@ -13,7 +13,7 @@ $NetBSD$ $(eval $(call build-dependencies,rts,dist,1)) $(rts_dist_depfile_c_asm) : libffi/dist-install/build/ffi.h $(DTRACEPROBES_H) -+rts/Trace.h : $(DTRACEPROBES_H) ++rts/dist/build/Capability.o : $(DTRACEPROBES_H) #----------------------------------------------------------------------------- # libffi stuff -- 2.40.0