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

diff --git a/Makefile b/Makefile
index 83690d2..3e50ccd 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ CONFIGURE_ARGS+= --with-gcc=/usr/bin/gcc
 CONFIGURE_ARGS+= --with-gcc=${CCPATH}
 .endif
 
-USE_TOOLS+=	gmake gtar perl:run
+USE_TOOLS+=			gmake gtar perl:run
 CONFIGURE_ENV+=		PerlCmd=${PERL5:Q}
 
 # We don't want to extract all of the DISTFILEs.
@@ -101,7 +101,7 @@ ${WRKDIR}/stamp-prepare-bootstrap:
 		${PHASE_MSG} "Preparing bootstrap compiler for ${PKGNAME}" && \
 		${RM} -rf bootstrap && \
 		${MKDIR} -p bootstrap/${DISTNAME}/utils/ghc-pwd/dist-boot && \
-		${GTAR} -cf - ${DISTNAME} | ${GTAR} -C bootstrap -xpf - && \
+		${GTAR} -cf - ${DISTNAME} | ${GTAR} -C bootstrap -xf - && \
 		${LN} -sf ${PWD_CMD} bootstrap/${DISTNAME}/utils/ghc-pwd/dist-boot/ghc-pwd && \
 		${TOUCH} ${.TARGET}
 
@@ -112,10 +112,11 @@ ${WRKDIR}/stamp-configure-hc-boot: ${WRKDIR}/stamp-prepare-bootstrap
 		${TOUCH} ${.TARGET}
 
 ${WRKDIR}/stamp-extract-hc: ${WRKDIR}/stamp-configure-hc-boot
-	${RUN} cd ${WRKDIR}/bootstrap/${DISTNAME} && \
+	${RUN} cd ${WRKDIR}/bootstrap && \
 		${PHASE_MSG} "Extracting bootstrap HC archive for ${PKGNAME}" && \
-		(cd .. && ${GTAR} -jxf ${DISTDIR}/${BOOTSTRAP_TARBALL}) && \
-		${SH} mkfiles && \
+		${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
@@ -130,7 +131,10 @@ ${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} -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