From mboxrd@z Thu Jan 1 00:00:00 1970 From: Danny Milosavljevic Subject: Re: Rust 1.19 fails to build on i686 on =?UTF-8?Q?=E2=80=98stagin?= =?UTF-8?Q?g=E2=80=99?= Date: Tue, 12 Feb 2019 13:06:58 +0100 Message-ID: <20190212130658.2c1f2a23@scratchpost.org> References: <87k1ioq21m.fsf@gnu.org> <20190128162705.052961e4@scratchpost.org> <877eenrhbj.fsf@gnu.org> <20190130185900.7f3d30a9@scratchpost.org> <20190205122839.06b482db@scratchpost.org> <20190205123510.510731a6@scratchpost.org> <20190211223456.0779cf68@scratchpost.org> <87o97hz0ra.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/iOhBbcTkC0sWrN7N_R1Bg.N"; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([209.51.188.92]:57672) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtWqD-0008T4-K3 for guix-devel@gnu.org; Tue, 12 Feb 2019 07:07:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtWqC-0001vN-Gf for guix-devel@gnu.org; Tue, 12 Feb 2019 07:07:09 -0500 In-Reply-To: <87o97hz0ra.fsf@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Chris Marusich Cc: Guix-devel --Sig_/iOhBbcTkC0sWrN7N_R1Bg.N Content-Type: multipart/mixed; boundary="MP_/gOUEbqwuxHCEV7Dezz4RNej" --MP_/gOUEbqwuxHCEV7Dezz4RNej Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hi Chris, On Tue, 12 Feb 2019 03:47:53 -0800 Chris Marusich wrote: > > Would you have some time and a free computer to be able to build rust 1= .19.0 with=20 > > > > ./pre-inst-env guix build -K -s i686-linux rust@1.19.0 > > > > on guix master with the patch below? =20 >=20 > I have a spare computer. It only has 2 GB of RAM and 2 GB of swap, > though. Will it be enough? If you don't run anything else on it (Firefox etc), it should be barely eno= ugh. > By the way, unfortunately your patch did not apply cleanly to the > current master branch head (c86b5f1b9bdfdd478ba15804f9343feb8d9c019b). > If you think my little computer will be able to crunch through the > build, I'm happy to let it run if you can supply a clean patch. Yeah, sorry, it was cut. I've cleaned it up and attached the new version. It should apply to master using "patch -p1 < mrustc-master.patch". --MP_/gOUEbqwuxHCEV7Dezz4RNej Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=mrustc-master.patch diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 501736d89..78705103b 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -101,11 +101,11 @@ (method git-fetch) (uri (git-reference (url "https://github.com/thepowersgang/mrustc.git") - (commit (string-append "v" version)))) + (commit "7b6fa5c6e7d6838c2479280dd3f8d14a43c13899"))) (file-name (git-file-name name version)) (sha256 (base32 - "0a7v8ccyzp1sdkwni8h1698hxpfz2sxhcpx42n6l2pbm0rbjp08i"))= )) + "0ki5jv76gmvd0q9y2lixzn4xhy1jamba3f77bk8cz2k4ix6yx5z1"))= )) (outputs '("out" "cargo")) (build-system gnu-build-system) (inputs @@ -118,6 +118,7 @@ ,(rust-source "1.19.0" "0l8c14qsf42rmkqy92ahij4vf356dbyspxcips1a= swpvad81y8qm")))) (arguments `(#:test-target "local_tests" + #:strip-binaries? #f #:make-flags (list (string-append "LLVM_CONFIG=3D" (assoc-ref %build-inputs "llvm") "/bin/llvm-config")) @@ -127,6 +128,9 @@ (lambda _ (substitute* "Makefile" (("shell date") "shell date -d @1")) + (substitute* "Makefile" + (("-g ") "-g3 ") + (("-O2") "")) #t)) (add-after 'patch-date 'unpack-target-compiler (lambda* (#:key inputs outputs #:allow-other-keys) @@ -184,7 +188,7 @@ safety and thread safety guarantees.") ;; Dual licensed. (license (list license:asl2.0 license:expat))))) =20 -(define rust-1.19 +(define-public rust-1.19 (package (name "rust") (version "1.19.0") @@ -308,12 +312,14 @@ test =3D { path =3D \"../libtest\" } (setenv "CFG_VERSION" #f) (setenv "CFG_PREFIX" #f) (setenv "CFG_LIBDIR_RELATIVE" #f) + ; Fails: (invoke (string-append rustc-bootstrap "/tools/bin/minicarg= o") "src/tools/cargo" "--vendor-dir" "src/vendor" "--output-dir" "output/cargo-build" "-L" "output/" "-L" (string-append rustc-bootstrap "/lib/mrust") "-j" "1") + ;(invoke "eee") ;; Now use the newly-built rustc to build the libraries. ;; One day that could be replaced by: ;; (invoke "output/cargo-build/cargo" "build" --MP_/gOUEbqwuxHCEV7Dezz4RNej-- --Sig_/iOhBbcTkC0sWrN7N_R1Bg.N Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAlxituIACgkQ5xo1VCww uqXeKQf+MM4HvZlcFgfCB6waQWyAKfW7ZpX8G0Jgp/LTvyIY/AwOCZyi3Npkyg4X Mi8xElQovUWrQnykkOM8OyIQpV1fmksk+58intXbcM95UwatZM5d4G1Jgu7V4YTJ bkuo+rjCwqoggB5xpVPCUzAPflEDH6l3k06pMwXvEga8KFGdSKn7rox268HNMcgd IT6jiUmvLCyOex6TtIFZfYWV7laWi0mr+oi4XGdTiz+0Cufe7CXO57Baj0n5gD33 8RsZtUuekaGyB+PrZ91/3KW4cjM3xOQD4X00j47pbcrLLWfD/i55JcQcrbVLRxhC hg1P1rxNMDxbvHBKrpGLWbut0AhH0g== =xsw8 -----END PGP SIGNATURE----- --Sig_/iOhBbcTkC0sWrN7N_R1Bg.N--