summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan (janneke) Nieuwenhuizen <janneke@gnu.org>2022-05-18 20:17:28 +0200
committerJan (janneke) Nieuwenhuizen <janneke@gnu.org>2022-05-18 20:19:59 +0200
commitf9fa47702be35ded14f8222a33d4da9207e2cce0 (patch)
tree7d44417e5dd5a13d9d2d8042602a673706ca367f
parent0062a2e0e09451ddde9b776fd99bfcc885db127e (diff)
gnu: bootstrap: Remove bootstrap-mes.
* gnu/packages/bootstrap.scm (%bootstrap-mes): Remove.
-rw-r--r--gnu/packages/bootstrap.scm52
1 files changed, 1 insertions, 51 deletions
diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 820aaaa1cc7..11cc8fbef9f 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -60,7 +60,6 @@
60 %bootstrap-gcc 60 %bootstrap-gcc
61 %bootstrap-glibc 61 %bootstrap-glibc
62 %bootstrap-inputs 62 %bootstrap-inputs
63 %bootstrap-mes
64 63
65 %bootstrap-inputs-for-tests)) 64 %bootstrap-inputs-for-tests))
66 65
@@ -931,55 +930,6 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \
931 (home-page #f) 930 (home-page #f)
932 (license gpl3+))) 931 (license gpl3+)))
933 932
934(define %bootstrap-mes
935 ;; The initial Mes. Uses binaries from a tarball typically built by
936 ;; %MES-BOOTSTRAP-TARBALL.
937 (package
938 (name "bootstrap-mes")
939 (version "0")
940 (source #f)
941 (build-system trivial-build-system)
942 (arguments
943 `(#:guile ,%bootstrap-guile
944 #:modules ((guix build utils))
945 #:builder
946 (begin
947 (use-modules (guix build utils)
948 (ice-9 popen))
949 (let ((out (assoc-ref %outputs "out"))
950 (tar (assoc-ref %build-inputs "tar"))
951 (xz (assoc-ref %build-inputs "xz"))
952 (tarball (assoc-ref %build-inputs "tarball")))
953
954 (mkdir out)
955 (copy-file tarball "binaries.tar.xz")
956 (invoke xz "-d" "binaries.tar.xz")
957 (let ((builddir (getcwd))
958 (bindir (string-append out "/bin")))
959 (with-directory-excursion out
960 (invoke tar "xvf"
961 (string-append builddir "/binaries.tar"))))))))
962 (inputs
963 `(("tar" ,(bootstrap-executable "tar" (%current-system)))
964 ("xz" ,(bootstrap-executable "xz" (%current-system)))
965 ("tarball"
966 ,(bootstrap-origin
967 (origin
968 (method url-fetch)
969 (uri (map
970 (cute string-append <>
971 "/i686-linux/20190815/"
972 "mes-minimal-stripped-0.19-i686-linux.tar.xz")
973 %bootstrap-base-urls))
974 (sha256
975 (base32
976 "1q4xjpx6nbn44kxnilpgl12bhpmwy2bblzwszc2ci7xkf400jcpv")))))))
977 (supported-systems '("i686-linux" "x86_64-linux"))
978 (synopsis "Bootstrap binaries of Mes")
979 (description synopsis)
980 (home-page #f)
981 (license gpl3+)))
982
983(define (%bootstrap-inputs) 933(define (%bootstrap-inputs)
984 ;; The initial, pre-built inputs. From now on, we can start building our 934 ;; The initial, pre-built inputs. From now on, we can start building our
985 ;; own packages. 935 ;; own packages.
@@ -997,7 +947,7 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \
997(define %bootstrap-inputs-for-tests 947(define %bootstrap-inputs-for-tests
998 ;; These are bootstrap inputs that are cheap to produce (no compilation 948 ;; These are bootstrap inputs that are cheap to produce (no compilation
999 ;; needed) and that are meant to be used for testing. (These are those we 949 ;; needed) and that are meant to be used for testing. (These are those we
1000 ;; used before the Mes-based reduced bootstrap.) 950 ;; used before the Mes-based full-source bootstrap.)
1001 `(("libc" ,%bootstrap-glibc) 951 `(("libc" ,%bootstrap-glibc)
1002 ("gcc" ,%bootstrap-gcc) 952 ("gcc" ,%bootstrap-gcc)
1003 ("binutils" ,%bootstrap-binutils) 953 ("binutils" ,%bootstrap-binutils)