From 062134985802d85066418f6ee2f327122166a567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 15 Nov 2013 00:10:10 +0100 Subject: gnu: Switch to GCC 4.8 as the default compiler. * build-aux/download.scm (file-name->uri): Update URL to /20131110. * gnu-system.am (nodist_bootstrap_x86_64_linux_DATA, nodist_bootstrap_i686_linux_DATA): Change base name to 'guile-2.0.9.tar.xz'. (gnu/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz, gnu/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz): New targets. (gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz, gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz): Remove. (gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz): Update hash. * gnu/packages/base.scm (gcc-boot0): Base upon GCC-4.8. Enable C++, and add a few --disable flags. Remove MPFR workaround. (cross-gcc-wrapper): Base upon GCC-4.8. Wrap both 'gcc' and 'g++'. (libstdc++): New variable. (gcc-final): Add it as an input; pass corresponding -I and -L flags. * gnu/packages/bootstrap.scm (%bootstrap-guile): Always use "guile-2.0.9.tar.xz. (%bootstrap-coreutils&co): Update hashes. (%bootstrap-binutils): Update URL and hashes. (%bootstrap-glibc): Likewise. (%bootstrap-gcc): Likewise. * gnu/packages/gcc.scm (gcc-4.7): Add LDFLAGS. Add --disable-libstdcxx-pch. Modify the GNU_USER*_SPEC macros from gnu-user*.h instead of the raw _SPEC macros. --- gnu/packages/bootstrap.scm | 55 ++++++++++++++-------------------------------- 1 file changed, 17 insertions(+), 38 deletions(-) (limited to 'gnu/packages/bootstrap.scm') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index d369edb8b6..981cde9f2b 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -180,12 +180,7 @@ check whether everything is alright." (xz (->store "xz")) (mkdir (->store "mkdir")) (bash (->store "bash")) - (guile (->store - (match (%current-system) - ("mips64el-linux" - "guile-2.0.9.tar.xz") - (_ - "guile-2.0.7.tar.xz")))) + (guile (->store "guile-2.0.9.tar.xz")) (builder (add-text-to-store store "build-bootstrap-guile.sh" @@ -224,23 +219,19 @@ $out/bin/guile --version~%" (origin (method url-fetch) (uri (map (cut string-append <> "/" system - (match system - ("mips64el-linux" - "/20131017/static-binaries.tar.xz") - (_ - "/20130105/static-binaries.tar.xz"))) + "/20131110/static-binaries.tar.xz") %bootstrap-base-urls)) (sha256 (match system ("x86_64-linux" (base32 - "0md23alzy6nc5f16pric7mkagczdzr8xbh074sb3rjzrls06j1ls")) + "0c533p9dhczzcsa1117gmfq3pc8w362g4mx84ik36srpr7cx2bg4")) ("i686-linux" (base32 - "0nzj1lmm9b94g7k737cr4w1dv282w5nmhb53238ikax9r6pkc0yb")) + "0s5b3jb315n13m1k8095l0a5hfrsz8g0fv1b6riyc5hnxqyphlak")) ("mips64el-linux" (base32 - "17k5f1322b7n1difhlyw4cghxvq8fxj7wlhzghh4y362fshvvw1c")))))) + "072y4wyfsj1bs80r6vbybbafy8ya4vfy7qj25dklwk97m6g71753")))))) "true" ; the program to test "Bootstrap binaries of Coreutils, Awk, etc.")) @@ -250,23 +241,19 @@ $out/bin/guile --version~%" (origin (method url-fetch) (uri (map (cut string-append <> "/" system - (match system - ("mips64el-linux" - "/20131017/binutils-2.23.2.tar.xz") - (_ - "/20130105/binutils-2.22.tar.xz"))) + "/20131110/binutils-2.23.2.tar.xz") %bootstrap-base-urls)) (sha256 (match system ("x86_64-linux" (base32 - "1ffmk2yy2pxvkqgzrkzp3s4jpn4qaaksyk3b5nsc5cjwfm7qkgzh")) + "1j5yivz7zkjqfsfmxzrrrffwyayjqyfxgpi89df0w4qziqs2dg20")) ("i686-linux" (base32 - "1rafk6aq4sayvv3r3d2khn93nkyzf002xzh0xadlyci4mznr6b0a")) + "14jgwf9gscd7l2pnz610b1zia06dvcm2qyzvni31b8zpgmcai2v9")) ("mips64el-linux" (base32 - "1dpnmscgg1fxg9xmlbvcm1d8h8brjgqwaal748w3v3qf33is4sl6")))))) + "1x8kkhcxmfyzg1ddpz2pxs6fbdl6412r7x0nzbmi5n7mj8zw2gy7")))))) "ld" ; the program to test "Bootstrap binaries of the GNU Binutils")) @@ -308,23 +295,19 @@ $out/bin/guile --version~%" (origin (method url-fetch) (uri (map (cut string-append <> "/" (%current-system) - (match (%current-system) - ("mips64el-linux" - "/20131017/glibc-2.18.tar.xz") - (_ - "/20130105/glibc-2.17.tar.xz"))) + "/20131110/glibc-2.18.tar.xz") %bootstrap-base-urls)) (sha256 (match (%current-system) ("x86_64-linux" (base32 - "18kv1z9d8dr1j3hm9w7663kchqw9p6rsx11n1m143jgba2jz6jy3")) + "0jlqrgavvnplj1b083s20jj9iddr4lzfvwybw5xrcis9spbfzk7v")) ("i686-linux" (base32 - "08hv8i0axwnihrcgbz19x0a7s6zyv3yx38x8r29liwl8h82x9g88")) + "1hgrccw1zqdc7lvgivwa54d9l3zsim5pqm0dykxg0z522h6gr05w")) ("mips64el-linux" (base32 - "1w9x8r2him7qbqlm7ah1aq04kk2ydma44jzgdzsdj3kjx36sqyq1"))))))))) + "0k97a3whzx3apsi9n2cbsrr79ad6lh00klxph9hw4fqyp1abkdsg"))))))))) (synopsis "Bootstrap binaries and headers of the GNU C Library") (description #f) (home-page #f) @@ -383,23 +366,19 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (origin (method url-fetch) (uri (map (cut string-append <> "/" (%current-system) - (match (%current-system) - ("mips64el-linux" - "/20131017/gcc-4.7.3.tar.xz") - (_ - "/20130105/gcc-4.7.2.tar.xz"))) + "/20131110/gcc-4.8.2.tar.xz") %bootstrap-base-urls)) (sha256 (match (%current-system) ("x86_64-linux" (base32 - "1x1p7han5crnbw906iwdifykr6grzm0w27dy9gz75j0q1b32i4px")) + "17ga4m6195n4fnbzdkmik834znkhs53nkypp6557pl1ps7dgqbls")) ("i686-linux" (base32 - "06wqs0xxnpw3hn0xjb4c9cs0899p1xwkcysa2rvzhvpra0c5vsg2")) + "150c1arrf2k8vfy6dpxh59vcgs4p1bgiz2av5m19dynpks7rjnyw")) ("mips64el-linux" (base32 - "0g9z8cdlnlzbg67607rxxfk5vi4xjsdc7c2agvdnyzlp0shib6rb"))))))))) + "1m5miqkyng45l745n0sfafdpjkqv9225xf44jqkygwsipj2cv9ks"))))))))) (native-search-paths (list (search-path-specification (variable "CPATH") -- cgit v1.2.3