X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=3e50ccd2c09bef1160749b3b946869ac1ba9ccdd;hb=f4afb39c623b1c077a5ffeddbad2b4f451f0d975;hp=1639a3d042ed334b1b3f7bb65fce215b1ce00768;hpb=471a3302d9b9ce99390df5aa979c98366f53fdb8;p=pkgsrc-ghc.git

diff --git a/Makefile b/Makefile
index 1639a3d..3e50ccd 100644
--- a/Makefile
+++ b/Makefile
@@ -11,11 +11,11 @@ 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-netbsd.tar.bz2
 DISTFILES+=		${DISTNAME}-boot-powerpc-apple-darwin.tar.bz2
 
 
-#SITES.${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2	= http://static.cielonegro.org/archive/
+SITES.${DISTNAME}-boot-i386-unknown-netbsd.tar.bz2	= http://static.cielonegro.org/archive/
 SITES.${DISTNAME}-boot-i386-unknown-freebsd.tar.bz2	= http://static.cielonegro.org/archive/
 SITES.${DISTNAME}-boot-powerpc-apple-darwin.tar.bz2	= http://static.cielonegro.org/archive/
 
@@ -31,8 +31,7 @@ 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= FreeBSD-*-i386 Darwin-*-powerpc
+ONLY_FOR_PLATFORM= NetBSD-*-i386 FreeBSD-*-i386 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
@@ -47,7 +46,7 @@ CONFIGURE_ARGS+= --with-gcc=/usr/bin/gcc
 CONFIGURE_ARGS+= --with-gcc=${CCPATH}
 .endif
 
-USE_TOOLS+=	gmake bsdtar perl:run
+USE_TOOLS+=			gmake gtar perl:run
 CONFIGURE_ENV+=		PerlCmd=${PERL5:Q}
 
 # We don't want to extract all of the DISTFILEs.
@@ -99,31 +98,30 @@ pre-configure: ${WRKDIR}/stamp-bootstrap-ghc
 
 ${WRKDIR}/stamp-prepare-bootstrap:
 	${RUN} cd ${WRKDIR} && \
-		${ECHO} "====> Preparing bootstrap compiler" && \
+		${PHASE_MSG} "Preparing bootstrap compiler for ${PKGNAME}" && \
 		${RM} -rf bootstrap && \
-		${MKDIR} -p bootstrap && \
-		${CP} -r ${DISTNAME} bootstrap && \
-		cd bootstrap/${DISTNAME} && \
-		${MKDIR} -p utils/ghc-pwd/dist-boot && \
-		${LN} -sf ${PWD_CMD} utils/ghc-pwd/dist-boot/ghc-pwd && \
-		${TOUCH} $@
+		${MKDIR} -p bootstrap/${DISTNAME}/utils/ghc-pwd/dist-boot && \
+		${GTAR} -cf - ${DISTNAME} | ${GTAR} -C bootstrap -xf - && \
+		${LN} -sf ${PWD_CMD} bootstrap/${DISTNAME}/utils/ghc-pwd/dist-boot/ghc-pwd && \
+		${TOUCH} ${.TARGET}
 
 ${WRKDIR}/stamp-configure-hc-boot: ${WRKDIR}/stamp-prepare-bootstrap
 	${RUN} cd ${WRKDIR}/bootstrap/${DISTNAME} && \
-		${ECHO} "====> Configuring for bootstrap compiler" && \
+		${PHASE_MSG} "Configuring bootstrap compiler for ${PKGNAME}" && \
 		${SETENV} ${CONFIGURE_ENV} ./configure --enable-hc-boot --with-ghc="" ${CONFIGURE_ARGS} && \
-		${TOUCH} $@
+		${TOUCH} ${.TARGET}
 
 ${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 && \
-		${TOUCH} $@
+	${RUN} cd ${WRKDIR}/bootstrap && \
+		${PHASE_MSG} "Extracting bootstrap HC archive for ${PKGNAME}" && \
+		${FIND} ${DISTNAME} -type d -o -type f | ${XARGS} ${TOUCH} -t 200001010000 && \
+		${GTAR} -jxf ${DISTDIR}/${BOOTSTRAP_TARBALL} && \
+		(cd ${DISTNAME} && ${SH} mkfiles) && \
+		${TOUCH} ${.TARGET}
 
 ${WRKDIR}/stamp-rewrite-hc-paths: ${WRKDIR}/stamp-extract-hc
 	${RUN} cd ${WRKDIR}/bootstrap/${DISTNAME} && \
-		${ECHO} "====> Rewriting GHC source paths" && \
+		${PHASE_MSG} "Rewriting source paths in bootstrap compiler for ${PKGNAME}" && \
 		${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}); \
@@ -133,12 +131,15 @@ ${WRKDIR}/stamp-rewrite-hc-paths: ${WRKDIR}/stamp-extract-hc
 				   -e "s#\\[\\[GHC_SOURCE_PATH\\]\\]#`${PWD_CMD}`#g" $$i > $$i.tmp; \
 			${MV} -f $$i.tmp $$i; \
 		done && \
-		${TOUCH} -r inplace/lib/package.conf.d */*/package-data.mk */*/*/package-data.mk && \
-		${TOUCH} $@
+		${TOUCH} -r inplace/lib/package.conf.d \
+					*/*/package-data.mk \
+					*/*/*/package-data.mk \
+					compiler/stage?/build/Config.hs && \
+		${TOUCH} ${.TARGET}
 
 ${WRKDIR}/stamp-bootstrap-ghc: ${WRKDIR}/stamp-rewrite-hc-paths
 	${RUN} cd ${WRKDIR}/bootstrap/${DISTNAME} && \
-		${ECHO} "====> Building bootstrap compiler" && \
+		${PHASE_MSG} "Building bootstrap compiler for ${PKGNAME}" && \
 		${GMAKE} bootstrapping-files && \
 		${GMAKE} all_ghc_stage2 && \
 		${GMAKE} inplace/bin/ghc-pkg && \
@@ -146,7 +147,7 @@ ${WRKDIR}/stamp-bootstrap-ghc: ${WRKDIR}/stamp-rewrite-hc-paths
 		inplace/bin/ghc-pkg recache && \
 		${CP} -f inplace/bin/ghc-stage2 ${BUILDLINK_DIR}/bin/ghc && \
 		${CP} -f inplace/bin/ghc-pkg ${BUILDLINK_DIR}/bin/ghc-pkg && \
-		${TOUCH} $@
+		${TOUCH} ${.TARGET}
 
 do-configure:
 # Seemingly by mistake, ghc-7.0.3 has a prebuilt