From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44182) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g4SXu-0005Vj-TQ for guix-patches@gnu.org; Mon, 24 Sep 2018 11:13:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g4SN9-0002Sx-Eu for guix-patches@gnu.org; Mon, 24 Sep 2018 11:02:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:47965) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g4SN9-0002Ss-AR for guix-patches@gnu.org; Mon, 24 Sep 2018 11:02:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1g4SN9-0007me-7S for guix-patches@gnu.org; Mon, 24 Sep 2018 11:02:03 -0400 Subject: [bug#32822] [PATCH 3/4] gnu: rust@1.23.0: Use rust-bootstrapped-package. Resent-Message-ID: From: Danny Milosavljevic Date: Mon, 24 Sep 2018 17:01:33 +0200 Message-Id: <20180924150134.26799-3-dannym@scratchpost.org> In-Reply-To: <20180924150134.26799-1-dannym@scratchpost.org> References: <20180924144747.22338-1-dannym@scratchpost.org> <20180924150134.26799-1-dannym@scratchpost.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 32822@debbugs.gnu.org * gnu/packages/rust.scm (rust-1.23): Use rust-bootstrapped-package. --- gnu/packages/rust.scm | 45 +++++++++++++++---------------------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 2e51c4a5b..37c30c14e 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -656,35 +656,22 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" "1lrzzp0nh7s61wgfs2h6ilaqi6iq89f1pd1yaf65l87bssyl4ylb")) (define-public rust-1.23 - (package - (inherit rust-1.22) - (name "rust") - (version "1.23.0") - (source (rust-source version "14fb8vhjzsxlbi6yrn1r6fl5dlbdd1m92dn5zj5gmzfwf4w9ar3l")) - (native-inputs - `(("bison" ,bison) ; For the tests - ("cmake" ,cmake) - ("flex" ,flex) ; For the tests - ("gdb" ,gdb) ; For the tests - ("git" ,git) - ("procps" ,procps) ; For the tests - ("python-2" ,python-2) - ("rustc-bootstrap" ,rust-1.22) - ("cargo-bootstrap" ,rust-1.22 "cargo") - ("pkg-config" ,pkg-config) ; For "cargo" - ("which" ,which))) - (arguments - (substitute-keyword-arguments (package-arguments rust-1.22) - ((#:phases phases) - `(modify-phases ,phases - (delete 'configure-archiver) - (delete 'remove-ar) - (add-after 'unpack 'dont-build-native - (lambda _ - ;; XXX: Revisit this when we use gcc 6. - (substitute* "src/binaryen/CMakeLists.txt" - (("ADD_COMPILE_FLAG\\(\\\"-march=native\\\"\\)") "")) - #t)))))))) + (let ((base-rust (rust-bootstrapped-package rust-1.22 "1.23.0" + "14fb8vhjzsxlbi6yrn1r6fl5dlbdd1m92dn5zj5gmzfwf4w9ar3l"))) + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (delete 'configure-archiver) + (delete 'remove-ar) + (add-after 'unpack 'dont-build-native + (lambda _ + ;; XXX: Revisit this when we use gcc 6. + (substitute* "src/binaryen/CMakeLists.txt" + (("ADD_COMPILE_FLAG\\(\\\"-march=native\\\"\\)") "")) + #t))))))))) (define-public rust-1.24 (let ((base-rust