From: David Craven <david@craven.ch>
To: guix-devel@gnu.org
Subject: [PATCH 07/12] gnu: Add rust bootstrap binaries.
Date: Sun, 11 Dec 2016 18:25:32 +0100 [thread overview]
Message-ID: <20161211172537.23315-8-david@craven.ch> (raw)
In-Reply-To: <20161211172537.23315-1-david@craven.ch>
* gnu/packages/rust.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add rust.scm.
---
gnu/local.mk | 1 +
gnu/packages/rust.scm | 190 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 191 insertions(+)
create mode 100644 gnu/packages/rust.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index 98a7f65ca..246057f69 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -321,6 +321,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/rsync.scm \
%D%/packages/ruby.scm \
%D%/packages/rush.scm \
+ %D%/packages/rust.scm \
%D%/packages/samba.scm \
%D%/packages/sawfish.scm \
%D%/packages/scanner.scm \
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
new file mode 100644
index 000000000..34f87c689
--- /dev/null
+++ b/gnu/packages/rust.scm
@@ -0,0 +1,190 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 David Craven <david@craven.ch>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages rust)
+ #:use-module (gnu packages base)
+ #:use-module (gnu packages bootstrap)
+ #:use-module (gnu packages commencement)
+ #:use-module (gnu packages compression)
+ #:use-module (gnu packages elf)
+ #:use-module (gnu packages gcc)
+ #:use-module (guix build-system gnu)
+ #:use-module (guix build-system trivial)
+ #:use-module (guix download)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix packages)
+ #:use-module (ice-9 match)
+ #:use-module (srfi srfi-26))
+
+;; Should be one less than the current released version.
+(define %rust-bootstrap-binaries-version "1.12.1")
+
+(define %rust-bootstrap-binaries
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://static.rust-lang.org/dist/"
+ ;; TODO: Maybe use the i686 binary for bootstrapping rustc on i686 and
+ ;; x86_64 to minimize the number binaries.
+ "rust-" %rust-bootstrap-binaries-version
+ "-x86_64-unknown-linux-gnu.tar.gz"))
+ (sha256
+ (base32
+ ;; 1.13.0 "1vaicmm0z6wlqdhshry14mfqgayp5n9pxs31h41w26mqn5rc7x4m"
+ "0k4qz7d0vd7z2sm4z7lpdhaaz9gbcx78yv6qladl52g32gn6lm4y"))))
+
+(define (increment-rust-version rust-version major patch)
+ (match (string-split rust-version #\.)
+ (("1" minor _)
+ (string-append (number->string major) "."
+ (number->string (+ (string->number minor) 1)) "."
+ (number->string patch)))))
+
+(define* (cargo-version rustc-version #:optional (patch 0))
+ ;; Computes the cargo version that matches the rustc version.
+ ;; https://github.com/rust-lang/cargo#Releases
+ (increment-rust-version rustc-version 0 patch))
+
+(define* (rustc-version bootstrap-version #:optional (patch 0))
+ ;; Computes the rustc version that can be compiled from a given
+ ;; other rustc version. The patch argument is for selecting
+ ;; a stability or security fix. 1.11.0 -> 1.12.1 -> 1.13.0
+ (increment-rust-version bootstrap-version 1 patch))
+
+(define (system->rust-platform system)
+ (cond
+ ((string-prefix? "x86_64" system) "x86_64-unknown-linux-gnu")
+ ((string-prefix? "i686" system) "i686-unknown-linux-gnu")
+ (else #f)))
+
+(define-public rustc-bootstrap
+ (package
+ (name "rustc-bootstrap")
+ (version %rust-bootstrap-binaries-version)
+ (source %rust-bootstrap-binaries)
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("patchelf" ,patchelf)))
+ (inputs
+ ;; FIXME: Use system gcc:lib. Does gcc "lib" need to be
+ ;; added to %final-inputs?
+ `(("gcc:lib" ,gcc "lib")
+ ("zlib" ,zlib)))
+ (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"))
+ (gcc (assoc-ref inputs "gcc"))
+ (gcc:lib (assoc-ref inputs "gcc:lib"))
+ (libc (assoc-ref inputs "libc"))
+ (zlib (assoc-ref inputs "zlib"))
+ (platform ,(system->rust-platform (%current-system)))
+ (ld-so (string-append (assoc-ref inputs "libc")
+ ,(glibc-dynamic-linker)))
+ (rpath (string-append out "/lib:" zlib "/lib:"
+ libc "/lib:" gcc:lib "/lib"))
+ (rustc (string-append out "/bin/rustc"))
+ (rustdoc (string-append out "/bin/rustdoc")))
+ (system* "bash" "install.sh"
+ (string-append "--prefix=" out)
+ (string-append "--components=rustc,"
+ "rust-std-" platform))
+ (for-each (lambda (file)
+ (system* "patchelf" "--set-rpath" rpath file))
+ (cons* rustc rustdoc (find-files out "\\.so$")))
+ (for-each (lambda (file)
+ (system* "patchelf" "--set-interpreter" ld-so file))
+ (list rustc rustdoc))
+ ;; Rust requires a gcc toolchain for linking. It
+ ;; looks for a compiler named cc in it's path. This
+ ;; can probably be configured during the build.
+ (symlink (string-append gcc "/bin/gcc")
+ (string-append out "/bin/cc"))))))))
+ (home-page "https://www.rust-lang.org")
+ (synopsis "Rustc bootstrap")
+ (description "This package prepares the rustc binary for bootstrapping
+the rustc package.")
+ (license license:asl2.0)))
+
+(define-public cargo-bootstrap
+ (package
+ (name "cargo-bootstrap")
+ (version (cargo-version %rust-bootstrap-binaries-version))
+ (source %rust-bootstrap-binaries)
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("patchelf" ,patchelf)))
+ (inputs
+ ;; FIXME: See rustc-bootstrap.
+ `(("gcc:lib" ,gcc "lib")))
+ (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"))
+ (platform ,(system->rust-platform (%current-system)))
+ (gcc:lib (assoc-ref inputs "gcc:lib"))
+ (libc (assoc-ref inputs "libc"))
+ (ld-so (string-append libc ,(glibc-dynamic-linker)))
+ (rpath (string-append out "/lib:" libc "/lib:"
+ gcc:lib "/lib"))
+ (cargo (string-append out "/bin/cargo")))
+ (system* "bash" "install.sh"
+ (string-append "--prefix=" out)
+ "--components=cargo")
+ (system* "patchelf"
+ "--set-interpreter" ld-so
+ "--set-rpath" rpath
+ cargo)))))))
+ (home-page "https://www.rust-lang.org")
+ (synopsis "Cargo bootstrap")
+ (description "This package prepares the cargo binary for bootstrapping
+the cargo package and it's dependencies. When rustc is build using the new
+rustbuild build system it also requires cargo. The gnu build system is going
+to be deprecated.")
+ (license license:asl2.0)))
+
+(define-public rust-bootstrap
+ (package
+ (name "rust-bootstrap")
+ (version %rust-bootstrap-binaries-version)
+ (source #f)
+ (build-system trivial-build-system)
+ (propagated-inputs
+ ;; XXX: guix size shows a size of zero. Are propagated inputs not
+ ;; counted?
+ `(("rustc-bootstrap" ,rustc-bootstrap)
+ ("cargo-bootstrap" ,cargo-bootstrap)))
+ (arguments
+ `(#:builder
+ (begin (mkdir (assoc-ref %outputs "out")))))
+ (home-page "https://www.rust-lang.org")
+ (synopsis "Rust bootstrap")
+ (description "Meta package for rustc and cargo bootstrap packages.")
+ (license license:asl2.0)))
--
2.11.0
next prev parent reply other threads:[~2016-12-11 17:26 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-11 17:25 [PATCH 00/12] Rust build system v2 David Craven
2016-12-11 17:25 ` [PATCH 01/12] upstream: Use a the first url from urls when find2 returns #f David Craven
2016-12-13 17:25 ` Ludovic Courtès
2016-12-13 20:07 ` David Craven
2016-12-13 22:22 ` Ludovic Courtès
2016-12-11 17:25 ` [PATCH 02/12] build-system: Add cargo build system David Craven
2016-12-13 17:26 ` Ludovic Courtès
2016-12-30 11:08 ` Danny Milosavljevic
2017-01-01 14:42 ` David Craven
2016-12-11 17:25 ` [PATCH 03/12] import: utils: Add some utilities David Craven
2016-12-13 17:29 ` Ludovic Courtès
2016-12-13 18:09 ` David Craven
2016-12-11 17:25 ` [PATCH 04/12] import: Add importer for rust crates David Craven
2016-12-13 17:30 ` Ludovic Courtès
2016-12-11 17:25 ` [PATCH 05/12] import: Add updater " David Craven
2016-12-13 17:30 ` Ludovic Courtès
2016-12-11 17:25 ` [PATCH 06/12] gnu: llvm: Enable install utils David Craven
2016-12-13 22:50 ` Ludovic Courtès
2016-12-11 17:25 ` David Craven [this message]
2016-12-13 22:44 ` [PATCH 07/12] gnu: Add rust bootstrap binaries Ludovic Courtès
2016-12-11 17:25 ` [PATCH 08/12] gnu: Add rustc David Craven
2016-12-13 22:47 ` Ludovic Courtès
2016-12-11 17:25 ` [PATCH 09/12] gnu: Add rust-libc David Craven
2016-12-13 22:48 ` Ludovic Courtès
2016-12-11 17:25 ` [PATCH 10/12] RECURSIVE IMPORTER wip David Craven
2016-12-13 22:49 ` Ludovic Courtès
2016-12-11 17:25 ` [PATCH 11/12] gnu: Add rust-rand David Craven
2016-12-13 22:50 ` Ludovic Courtès
2017-01-03 0:52 ` Danny Milosavljevic
2016-12-11 17:25 ` [PATCH 12/12] gnu: Add cargo David Craven
2016-12-13 22:51 ` 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=20161211172537.23315-8-david@craven.ch \
--to=david@craven.ch \
--cc=guix-devel@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).