X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=794adbf6bde0f2f90d009d75302a21c7ff4cab44;hb=ca5ba8cdaddffa113b9b4a8bf35bd83b6c8d2733;hp=d7542a97e1b4b5f4c885131718c40b32c1db49e4;hpb=bc3d4c0c58103a14df21359fc9df4a47cc148eda;p=pkgsrc-ghc.git

diff --git a/Makefile b/Makefile
index d7542a9..794adbf 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,8 @@ COMMENT=		Compiler for the functional language Haskell
 LICENSE=		modified-bsd
 
 DISTFILES=		${DISTNAME}-src.tar.bz2
-#DISTFILES+=		${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2
-#DISTFILES+=		${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2
+DISTFILES+=		${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2
+DISTFILES+=		${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2
 DISTFILES+=		${DISTNAME}-boot-powerpc-apple-darwin.tar.bz2
 
 
@@ -28,6 +28,9 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 # these packages are built with integer-simple, not integer-gmp, to
 # reduce some complexity by not depending on the GMP. The resulting
 # registerised GHC uses integer-gmp so this won't be a problem.
+#
+# If you want to build HC packages yourself, follow instructions in
+# the ./TODO file.
 ONLY_FOR_PLATFORM= NetBSD-*-i386 FreeBSD-*-i386 Darwin-*-powerpc
 
 # We must provide the real pass to gcc to the ./configure script,
@@ -80,6 +83,8 @@ PLATFORM           = i386-unknown-freebsd
 .elif ${MACHINE_ARCH} == "powerpc" && ${OPSYS} == "Darwin"
 BOOTSTRAP_BUILD_MK = ${PKGDIR}/files/bootstrap.mk
 PLATFORM           = powerpc-apple-darwin
+WARNINGS+= "You won't be able to use GHCi library for GHC itself\
+because of Mach-O limitation."
 
 # Existence of libelf makes LeadingUnderscore being "NO", which is
 # incorrect. See ghc-6.12.1/aclocal.m4 (FP_LEADING_UNDERSCORE)
@@ -148,27 +153,9 @@ 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
-
-pre-build:
-# We have to sacrifice the GHCi library for GHC itself to work around
-# for powerpc ld bug.  See
-# http://hackage.haskell.org/trac/ghc/ticket/3260
-.if ${MACHINE_ARCH} == "powerpc"
-	${RUN} ${MKDIR} ${WRKSRC}/compiler/stage1/build
-	${RUN} ${TOUCH} -t `expr \`date '+%Y'\` + 1`12310000 \
-					${WRKSRC}/compiler/stage1/build/HS${DISTNAME}.o
-	${RUN} ${MKDIR} ${WRKSRC}/compiler/stage2/build
-	${RUN} ${TOUCH} -t `expr \`date '+%Y'\` + 1`12310000 \
-					${WRKSRC}/compiler/stage2/build/HS${DISTNAME}.o
-.endif
-
-.if ${MACHINE_ARCH} == "powerpc"
-WARNINGS+= "You won't be able to use GHCi library for GHC itself\
-because of powerpc ld bug."
+.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.