X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=pkgsrc-ghc.git;a=blobdiff_plain;f=Makefile;h=2a0cbfbbe0bea18fa52279125d74c3e8cfff3ade;hp=794adbf6bde0f2f90d009d75302a21c7ff4cab44;hb=8fa3d45608aad3bebde37f7bdb182c25cbf63715;hpb=fe580228d910090d3f64dc208c63f2212c735eb6

diff --git a/Makefile b/Makefile
index 794adbf..2a0cbfb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,17 @@
 # $NetBSD: Makefile,v 1.42 2008/07/07 14:58:00 kristerw Exp $
 
 DISTNAME=		ghc-${VERSION}
-VERSION=		6.12.3
+VERSION=		7.0.1
 CATEGORIES=		lang
-MASTER_SITES=	http://darcs.haskell.org/download/dist/${VERSION}/
+MASTER_SITES=	http://new-www.haskell.org/ghc/dist/${VERSION}/
 MAINTAINER=		kristerw@NetBSD.org
 HOMEPAGE=		http://www.haskell.org/ghc/
 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
 
 
@@ -31,7 +31,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 #
 # If you want to build HC packages yourself, follow instructions in
 # the ./TODO file.
-ONLY_FOR_PLATFORM= NetBSD-*-i386 FreeBSD-*-i386 Darwin-*-powerpc
+#ONLY_FOR_PLATFORM= NetBSD-*-i386 FreeBSD-*-i386 Darwin-*-powerpc
+ONLY_FOR_PLATFORM= Darwin-*-powerpc
 
 # We must provide the real pass to gcc to the ./configure script,
 # because GHC has a runtime dependency on it. Aren't there any ways
@@ -83,8 +84,6 @@ 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)
@@ -96,19 +95,34 @@ PKG_FAIL_REASON+=	"internal error: unsupported platform"
 
 BOOTSTRAP_TARBALL = ${DISTNAME}-boot-${PLATFORM}.tar.bz2
 
-pre-configure:
+pre-configure: ${WRKDIR}/stamp-bootstrap-ghc
+
+${WRKDIR}/stamp-prepare-bootstrap:
 	${RUN} cd ${WRKDIR} && \
 		${ECHO} "====> Preparing bootstrap compiler" && \
+		${RM} -rf bootstrap && \
 		${MKDIR} bootstrap && \
 		${CP} -r ${DISTNAME} bootstrap && \
 		cd bootstrap/${DISTNAME} && \
 		${LN} -sf ${PWD_CMD} utils/ghc-pwd/ghc-pwd && \
+		${TOUCH} $@
+
+${WRKDIR}/stamp-configure-hc-boot: ${WRKDIR}/stamp-prepare-bootstrap
+	${RUN} cd ${WRKDIR}/bootstrap/${DISTNAME} && \
 		${ECHO} "====> Configuring for bootstrap compiler" && \
 		${SETENV} ${CONFIGURE_ENV} ./configure --enable-hc-boot --with-ghc="" ${CONFIGURE_ARGS} && \
+		${TOUCH} $@
+
+${WRKDIR}/stamp-extract-hc: ${WRKDIR}/stamp-configure-hc-boot
+	${RUN} cd ${WRKDIR}/bootstrap/${DISTNAME} && \
 		${ECHO} "====> Extracting bootstrap HC archive" && \
 		(cd .. && bsdtar jxfm ${DISTDIR}/${BOOTSTRAP_TARBALL}) && \
 		${SH} mkfiles && \
-		${ECHO} "====> Building bootstrap compiler" && \
+		${TOUCH} $@
+
+${WRKDIR}/stamp-rewrite-hc-paths: ${WRKDIR}/stamp-extract-hc
+	${RUN} cd ${WRKDIR}/bootstrap/${DISTNAME} && \
+		${ECHO} "====> Rewriting GHC source paths" && \
 		${SED} -e "s#\\[\\[PREFIX\\]\\]#${PREFIX}#g" ${BOOTSTRAP_BUILD_MK} > mk/build.mk && \
 		for c in libraries/*/configure; do \
 			(cd `${DIRNAME} $$c` && ${SETENV} ${CONFIGURE_ENV} ${SH} configure ${CONFIGURE_ARGS}); \
@@ -118,13 +132,19 @@ pre-configure:
 			${MV} -f $$i.tmp $$i; \
 		done && \
 		${TOUCH} -r inplace/lib/package.conf.d */*/package-data.mk */*/*/package-data.mk && \
+		${TOUCH} $@
+
+${WRKDIR}/stamp-bootstrap-ghc: ${WRKDIR}/stamp-rewrite-hc-paths
+	${RUN} cd ${WRKDIR}/bootstrap/${DISTNAME} && \
+		${ECHO} "====> Building bootstrap compiler" && \
 		${GMAKE} bootstrapping-files && \
 		${GMAKE} all_ghc_stage2 && \
 		${GMAKE} inplace/bin/ghc-pkg && \
 		${GMAKE} inplace/lib/unlit && \
 		inplace/bin/ghc-pkg recache && \
-		${CP} inplace/bin/ghc-stage2 ${BUILDLINK_DIR}/bin/ghc && \
-		${CP} inplace/bin/ghc-pkg ${BUILDLINK_DIR}/bin/ghc-pkg
+		${CP} -f inplace/bin/ghc-stage2 ${BUILDLINK_DIR}/bin/ghc && \
+		${CP} -f inplace/bin/ghc-pkg ${BUILDLINK_DIR}/bin/ghc-pkg && \
+		${TOUCH} $@
 
 do-configure:
 	${RUN} cd ${WRKSRC} && \
@@ -139,7 +159,7 @@ do-configure:
 	${RUN} ${ECHO} "libraries/terminfo_CONFIGURE_OPTS += \
 		--configure-option=--with-curses-includes=${PREFIX}/include \
 		--configure-option=--with-curses-libraries=${PREFIX}/lib" >> ${WRKSRC}/mk/build.mk
-# The ghc compiler does normally split the generated C files into small
+# The ghc compiler does normally split the generated asm files into small
 # parts before sending them to gcc, to enable the linker to eliminate
 # unused parts.  This does however not play nice with the pkgsrc
 # framework, and the result is that the build takes more than 5 times