From: Danny Milosavljevic <dannym@scratchpost.org>
To: 32822@debbugs.gnu.org
Subject: [bug#32822] [PATCH 4/4] gnu: rust: Remove binary bootstrapper.
Date: Mon, 24 Sep 2018 17:01:34 +0200 [thread overview]
Message-ID: <20180924150134.26799-4-dannym@scratchpost.org> (raw)
In-Reply-To: <20180924150134.26799-1-dannym@scratchpost.org>
* gnu/packages/rust.scm (rust-bootstrap): Delete variable.
---
gnu/packages/rust.scm | 82 -------------------------------------------
1 file changed, 82 deletions(-)
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 37c30c14e..e30e8a61a 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -69,88 +69,6 @@
("mips64el-linux" "mips64el-unknown-linux-gnuabi64")
(_ (nix-system->gnu-triplet system))))
-(define rust-bootstrap
- (package
- (name "rust-bootstrap")
- (version "1.22.1")
- (source #f)
- (build-system gnu-build-system)
- (native-inputs
- `(("patchelf" ,patchelf)))
- (inputs
- `(("gcc" ,(canonical-package gcc))
- ("gcc:lib" ,(canonical-package gcc) "lib")
- ("zlib" ,zlib)
- ("source"
- ,(origin
- (method url-fetch)
- (uri (string-append
- "https://static.rust-lang.org/dist/"
- "rust-" version "-" (nix-system->gnu-triplet-for-rust)
- ".tar.gz"))
- (sha256
- (base32
- (match (nix-system->gnu-triplet-for-rust)
- ("i686-unknown-linux-gnu"
- "15zqbx86nm13d5vq2gm69b7av4vg479f74b5by64hs3bcwwm08pr")
- ("x86_64-unknown-linux-gnu"
- "1yll78x6b3abnvgjf2b66gvp6mmcb9y9jdiqcwhmgc0z0i0fix4c")
- ("armv7-unknown-linux-gnueabihf"
- "138a8l528kzp5wyk1mgjaxs304ac5ms8vlpq0ggjaznm6bn2j7a5")
- ("aarch64-unknown-linux-gnu"
- "0z6m9m1rx4d96nvybbfmpscq4dv616m615ijy16d5wh2vx0p4na8")
- ("mips64el-unknown-linux-gnuabi64"
- "07k4pcv7jvfa48cscdj8752lby7m7xdl88v3a6na1vs675lhgja2")
- (_ ""))))))))
- (outputs '("out" "cargo"))
- (arguments
- `(#:tests? #f
- #:strip-binaries? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (delete 'build)
- (replace 'install
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (cargo-out (assoc-ref outputs "cargo"))
- (gcc:lib (assoc-ref inputs "gcc:lib"))
- (libc (assoc-ref inputs "libc"))
- (zlib (assoc-ref inputs "zlib"))
- (ld-so (string-append libc ,(glibc-dynamic-linker)))
- (rpath (string-append out "/lib:" zlib "/lib:"
- libc "/lib:" gcc:lib "/lib"))
- (cargo-rpath (string-append cargo-out "/lib:" libc "/lib:"
- gcc:lib "/lib"))
- (rustc (string-append out "/bin/rustc"))
- (rustdoc (string-append out "/bin/rustdoc"))
- (cargo (string-append cargo-out "/bin/cargo"))
- (gcc (assoc-ref inputs "gcc")))
- ;; Install rustc/rustdoc.
- (invoke "bash" "install.sh"
- (string-append "--prefix=" out)
- (string-append "--components=rustc,"
- "rust-std-"
- ,(nix-system->gnu-triplet-for-rust)))
- ;; Install cargo.
- (invoke "bash" "install.sh"
- (string-append "--prefix=" cargo-out)
- (string-append "--components=cargo"))
- (for-each (lambda (file)
- (invoke "patchelf" "--set-rpath" rpath file))
- (cons* rustc rustdoc (find-files out "\\.so$")))
- (invoke "patchelf" "--set-rpath" cargo-rpath cargo)
- (for-each (lambda (file)
- (invoke "patchelf" "--set-interpreter" ld-so file))
- (list rustc rustdoc cargo))
- #t))))))
- (home-page "https://www.rust-lang.org")
- (synopsis "Prebuilt rust compiler and cargo package manager")
- (description "This package provides a pre-built @command{rustc} compiler
-and a pre-built @command{cargo} package manager, which can
-in turn be used to build the final Rust.")
- (license license:asl2.0)))
-
\f
(define* (rust-source version hash #:key (patches '()))
(origin
next prev parent reply other threads:[~2018-09-24 15:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-24 14:47 [bug#32822] [PATCH 0/4] Finish rust bootstrapping Danny Milosavljevic
2018-09-24 15:01 ` [bug#32822] [PATCH 1/4] gnu: rust: Hide "ar" entry from rust@1.21.0 Danny Milosavljevic
2018-09-24 15:01 ` [bug#32822] [PATCH 2/4] gnu: rust@1.23.0: Bootstrap by rust@1.22.0 Danny Milosavljevic
2018-09-24 15:01 ` [bug#32822] [PATCH 3/4] gnu: rust@1.23.0: Use rust-bootstrapped-package Danny Milosavljevic
2018-09-24 15:01 ` Danny Milosavljevic [this message]
2018-09-24 19:38 ` [bug#32822] [PATCH 0/4] Finish rust bootstrapping Ludovic Courtès
2018-09-25 8:01 ` Danny Milosavljevic
2018-09-25 15:31 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180924150134.26799-4-dannym@scratchpost.org \
--to=dannym@scratchpost.org \
--cc=32822@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).