From e23df020f1fa71a2d4e1e76456c9ea9804d2c795 Mon Sep 17 00:00:00 2001
From: PHO <pho@cielonegro.org>
Date: Fri, 3 Feb 2012 23:37:17 +0900
Subject: [PATCH] Take a different way to unpack a bootstrap HC archive.

---
 Makefile | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index f80ff24..67db91a 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 bsdtar perl:run
+USE_TOOLS+=	gmake gtar perl:run
 CONFIGURE_ENV+=		PerlCmd=${PERL5:Q}
 
 # We don't want to extract all of the DISTFILEs.
@@ -100,11 +100,9 @@ ${WRKDIR}/stamp-prepare-bootstrap:
 	${RUN} cd ${WRKDIR} && \
 		${ECHO} "====> Preparing bootstrap compiler" && \
 		${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 && \
+		${MKDIR} -p bootstrap/${DISTNAME}/utils/ghc-pwd/dist-boot && \
+		${GTAR} -cf - ${DISTNAME} | ${GTAR} -C bootstrap -xpvf - && \
+		${LN} -sf ${PWD_CMD} bootstrap/${DISTNAME}/utils/ghc-pwd/dist-boot/ghc-pwd && \
 		${TOUCH} $@
 
 ${WRKDIR}/stamp-configure-hc-boot: ${WRKDIR}/stamp-prepare-bootstrap
@@ -116,7 +114,7 @@ ${WRKDIR}/stamp-configure-hc-boot: ${WRKDIR}/stamp-prepare-bootstrap
 ${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}) && \
+		(cd .. && ${GTAR} -jxf ${DISTDIR}/${BOOTSTRAP_TARBALL}) && \
 		${SH} mkfiles && \
 		${TOUCH} $@
 
-- 
2.40.0