7.6.2 for x86_64-unknown-linux

diff --git a/Makefile b/Makefile
index d91cc7d5cb570c1fa01d2564c53d20ec98504fb5..9a01243b49811ca0d47a06e29d500105ea0cdf0d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ DISTFILES=    ${DISTNAME}-src.tar.bz2
 #DISTFILES+=   ${DISTNAME}-boot-i386-unknown-freebsd8.0.tar.bz2
 #DISTFILES+=   ${DISTNAME}-boot-i386-unknown-netbsdelf6.99.1.tar.bz2
 DISTFILES+=    ${DISTNAME}-boot-powerpc-apple-darwin.tar.xz
 #DISTFILES+=   ${DISTNAME}-boot-i386-unknown-freebsd8.0.tar.bz2
 #DISTFILES+=   ${DISTNAME}-boot-i386-unknown-netbsdelf6.99.1.tar.bz2
 DISTFILES+=    ${DISTNAME}-boot-powerpc-apple-darwin.tar.xz

-#DISTFILES+=   ${DISTNAME}-boot-x86_64-unknown-linux-gnu.tar.bz2
+DISTFILES+=    ${DISTNAME}-boot-x86_64-unknown-linux.tar.xz

 DISTFILES+=    ${DISTNAME}-boot-x86_64-unknown-netbsd.tar.xz
 
 .for i in ${DISTFILES:M*-boot-*}
 DISTFILES+=    ${DISTNAME}-boot-x86_64-unknown-netbsd.tar.xz
 
 .for i in ${DISTFILES:M*-boot-*}

diff --git a/bootstrap.mk b/bootstrap.mk
index a3fe3bc9742c15f504d3d45c833a783680b109d8..e882ea67fe9d3d58ce9c29b8b3f5f8713123e8ee 100644 (file)
--- a/bootstrap.mk
+++ b/bootstrap.mk
@@ -22,10 +22,10 @@ BOOT_ARCHIVE=       ${DISTNAME}-boot-powerpc-apple-darwin.tar.xz
 # Existence of libelf makes LeadingUnderscore being "NO", which is
 # incorrect for this platform. See ${WRKSRC}/aclocal.m4
 # (FP_LEADING_UNDERSCORE)
 # Existence of libelf makes LeadingUnderscore being "NO", which is
 # incorrect for this platform. See ${WRKSRC}/aclocal.m4
 # (FP_LEADING_UNDERSCORE)

-CONFLICTS+=            libelf-[0-9]*
+CONFLICTS+=    libelf-[0-9]*

 
 .elif ${MACHINE_ARCH} == "x86_64" && ${OPSYS} == "Linux"
 
 .elif ${MACHINE_ARCH} == "x86_64" && ${OPSYS} == "Linux"

-BOOT_ARCHIVE=  ${DISTNAME}-boot-x86_64-unknown-linux-gnu.tar.bz2
+BOOT_ARCHIVE=  ${DISTNAME}-boot-x86_64-unknown-linux.tar.xz

 
 .elif ${MACHINE_ARCH} == "x86_64" && ${OPSYS} == "NetBSD"
 BOOT_ARCHIVE=  ${DISTNAME}-boot-x86_64-unknown-netbsd.tar.xz
 
 .elif ${MACHINE_ARCH} == "x86_64" && ${OPSYS} == "NetBSD"
 BOOT_ARCHIVE=  ${DISTNAME}-boot-x86_64-unknown-netbsd.tar.xz

diff --git a/distinfo b/distinfo
index b62897b42005d9f46feb707917a4ad0e096f88c7..4793cd38a91d8de8f4a56b267080e406117ab156 100644 (file)
--- a/distinfo
+++ b/distinfo
@@ -3,6 +3,9 @@ $NetBSD$
 SHA1 (ghc-7.6.2-boot-powerpc-apple-darwin.tar.xz) = 90a4e64842426dd956650e8ef2e17e9ef0b9a69b
 RMD160 (ghc-7.6.2-boot-powerpc-apple-darwin.tar.xz) = fb1b85b25195846f260b4f8082908e80bc7a6d0f
 Size (ghc-7.6.2-boot-powerpc-apple-darwin.tar.xz) = 33635664 bytes
 SHA1 (ghc-7.6.2-boot-powerpc-apple-darwin.tar.xz) = 90a4e64842426dd956650e8ef2e17e9ef0b9a69b
 RMD160 (ghc-7.6.2-boot-powerpc-apple-darwin.tar.xz) = fb1b85b25195846f260b4f8082908e80bc7a6d0f
 Size (ghc-7.6.2-boot-powerpc-apple-darwin.tar.xz) = 33635664 bytes

+SHA1 (ghc-7.6.2-boot-x86_64-unknown-linux.tar.xz) = 3cb91c05cd1c0f12e3420d466636e110934a11ac
+RMD160 (ghc-7.6.2-boot-x86_64-unknown-linux.tar.xz) = 4a57fcbe2c7b99371f61e3a8f4bfdc4e9aae4339
+Size (ghc-7.6.2-boot-x86_64-unknown-linux.tar.xz) = 28837552 bytes

 SHA1 (ghc-7.6.2-boot-x86_64-unknown-netbsd.tar.xz) = 3d3e29ea427c9b26760fb232b77772bc63dd8938
 RMD160 (ghc-7.6.2-boot-x86_64-unknown-netbsd.tar.xz) = b1325b7ae4d39362073c24a226b6bd86d124569e
 Size (ghc-7.6.2-boot-x86_64-unknown-netbsd.tar.xz) = 28778048 bytes
 SHA1 (ghc-7.6.2-boot-x86_64-unknown-netbsd.tar.xz) = 3d3e29ea427c9b26760fb232b77772bc63dd8938
 RMD160 (ghc-7.6.2-boot-x86_64-unknown-netbsd.tar.xz) = b1325b7ae4d39362073c24a226b6bd86d124569e
 Size (ghc-7.6.2-boot-x86_64-unknown-netbsd.tar.xz) = 28778048 bytes