diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index a1d4c7f..9151e01 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -63,12 +63,13 @@ (fetch store url hash-algo hash #:guile %bootstrap-guile #:system system))) - + (if (string? source) + source (let ((orig-method (origin-method source))) (origin (inherit source) (method (cond ((eq? orig-method url-fetch) (boot url-fetch)) - (else orig-method)))))) + (else orig-method))))))) (define (package-from-tarball name* source* program-to-test description*) "Return a package that correspond to the extraction of SOURCE*. @@ -170,7 +171,10 @@ check whether everything is alright." (xz (->store "xz")) (mkdir (->store "mkdir")) (bash (->store "bash")) - (guile (->store "guile-2.0.7.tar.xz")) + (guile (->store + (if (string=? (%current-system) "mips64el-linux") + "guile-2.0.9.tar.xz" + "guile-2.0.7.tar.xz"))) (builder (add-text-to-store store "build-bootstrap-guile.sh" @@ -206,38 +210,18 @@ $out/bin/guile --version~%" (define %bootstrap-coreutils&co (package-from-tarball "bootstrap-binaries" (lambda (system) - (origin - (method url-fetch) - (uri (map (cut string-append <> "/" system - "/20130105/static-binaries.tar.xz") - %bootstrap-base-urls)) - (sha256 - (match system - ("x86_64-linux" - (base32 - "0md23alzy6nc5f16pric7mkagczdzr8xbh074sb3rjzrls06j1ls")) - ("i686-linux" - (base32 - "0nzj1lmm9b94g7k737cr4w1dv282w5nmhb53238ikax9r6pkc0yb")))))) + (string-append "/home/nikita/gnuabi64-tarballs/" + "m7vf579yxmif4fdp2qn1gcilfddp2m37-bootstrap-tarballs-0/" + "static-binaries-0-mips64el-linux-gnuabi64.tar.xz")) "true" ; the program to test "Bootstrap binaries of Coreutils, Awk, etc.")) (define %bootstrap-binutils (package-from-tarball "binutils-bootstrap" (lambda (system) - (origin - (method url-fetch) - (uri (map (cut string-append <> "/" system - "/20130105/binutils-2.22.tar.xz") - %bootstrap-base-urls)) - (sha256 - (match system - ("x86_64-linux" - (base32 - "1ffmk2yy2pxvkqgzrkzp3s4jpn4qaaksyk3b5nsc5cjwfm7qkgzh")) - ("i686-linux" - (base32 - "1rafk6aq4sayvv3r3d2khn93nkyzf002xzh0xadlyci4mznr6b0a")))))) + (string-append "/home/nikita/gnuabi64-tarballs/" + "m7vf579yxmif4fdp2qn1gcilfddp2m37-bootstrap-tarballs-0/" + "binutils-static-stripped-2.23.2-mips64el-linux-gnuabi64.tar.xz")) "ld" ; the program to test "Bootstrap binaries of the GNU Binutils")) @@ -275,20 +259,9 @@ $out/bin/guile --version~%" (inputs `(("tar" ,(search-bootstrap-binary "tar" (%current-system))) ("xz" ,(search-bootstrap-binary "xz" (%current-system))) - ("tarball" ,(bootstrap-origin - (origin - (method url-fetch) - (uri (map (cut string-append <> "/" (%current-system) - "/20130105/glibc-2.17.tar.xz") - %bootstrap-base-urls)) - (sha256 - (match (%current-system) - ("x86_64-linux" - (base32 - "18kv1z9d8dr1j3hm9w7663kchqw9p6rsx11n1m143jgba2jz6jy3")) - ("i686-linux" - (base32 - "08hv8i0axwnihrcgbz19x0a7s6zyv3yx38x8r29liwl8h82x9g88"))))))))) + ("tarball" ,(string-append "/home/nikita/gnuabi64-tarballs/" + "m7vf579yxmif4fdp2qn1gcilfddp2m37-bootstrap-tarballs-0/" + "glibc-stripped-2.17-mips64el-linux-gnuabi64.tar.xz")))) (synopsis "Bootstrap binaries and headers of the GNU C Library") (description #f) (home-page #f) @@ -343,20 +316,9 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ ("xz" ,(search-bootstrap-binary "xz" (%current-system))) ("bash" ,(search-bootstrap-binary "bash" (%current-system))) ("libc" ,%bootstrap-glibc) - ("tarball" ,(bootstrap-origin - (origin - (method url-fetch) - (uri (map (cut string-append <> "/" (%current-system) - "/20130105/gcc-4.7.2.tar.xz") - %bootstrap-base-urls)) - (sha256 - (match (%current-system) - ("x86_64-linux" - (base32 - "1x1p7han5crnbw906iwdifykr6grzm0w27dy9gz75j0q1b32i4px")) - ("i686-linux" - (base32 - "06wqs0xxnpw3hn0xjb4c9cs0899p1xwkcysa2rvzhvpra0c5vsg2"))))))))) + ("tarball" ,(string-append "/home/nikita/gnuabi64-tarballs/" + "m7vf579yxmif4fdp2qn1gcilfddp2m37-bootstrap-tarballs-0/" + "gcc-stripped-4.7.3-mips64el-linux-gnuabi64.tar.xz")))) (native-search-paths (list (search-path-specification (variable "CPATH")