From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:470:142:3::10]:56639)
 by lists.gnu.org with esmtp (Exim 4.86_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1hd4Mp-00040t-K6
 for guix-patches@gnu.org; Mon, 17 Jun 2019 23:01:04 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1hd4Mo-0008Em-HX
 for guix-patches@gnu.org; Mon, 17 Jun 2019 23:01:03 -0400
Received: from debbugs.gnu.org ([209.51.188.43]:58259)
 by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
 (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1hd4Mo-0008EK-D9
 for guix-patches@gnu.org; Mon, 17 Jun 2019 23:01:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1hd4Mo-0001mz-AC
 for guix-patches@gnu.org; Mon, 17 Jun 2019 23:01:02 -0400
Subject: [bug#36272] [PATCH] gnu: rust: fix building bootstrap chain
Resent-Message-ID: <handler.36272.B.15608268166800@debbugs.gnu.org>
Received: from eggs.gnu.org ([2001:470:142:3::10]:56500)
 by lists.gnu.org with esmtp (Exim 4.86_2)
 (envelope-from <ivanppetkov@gmail.com>) id 1hd4M1-0003nA-Hk
 for guix-patches@gnu.org; Mon, 17 Jun 2019 23:00:14 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <ivanppetkov@gmail.com>) id 1hd4M0-00079n-HI
 for guix-patches@gnu.org; Mon, 17 Jun 2019 23:00:13 -0400
Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]:39831)
 by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
 (Exim 4.71) (envelope-from <ivanppetkov@gmail.com>)
 id 1hd4M0-000783-3o
 for guix-patches@gnu.org; Mon, 17 Jun 2019 23:00:12 -0400
Received: by mail-pl1-x62c.google.com with SMTP id b7so5051439pls.6
 for <guix-patches@gnu.org>; Mon, 17 Jun 2019 20:00:12 -0700 (PDT)
From: Ivan Petkov <ivanppetkov@gmail.com>
Content-Type: multipart/mixed;
 boundary="Apple-Mail=_2BF4C64F-69D8-4EB8-A9DC-56211E5A352C"
Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\))
Date: Mon, 17 Jun 2019 20:00:09 -0700
Message-Id: <63B38722-EBE9-4025-92EB-D7FEC694A946@gmail.com>
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: 36272@debbugs.gnu.org
Cc: Chris Marusich <cmmarusich@gmail.com>


--Apple-Mail=_2BF4C64F-69D8-4EB8-A9DC-56211E5A352C
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=utf-8

This patch fixes building rust versions 1.30 and onwards:

* Thanks to a newer GDB version being present, we no longer need to =
patch the
debug-info tests to the older (and now incorrect) format.
* Downgrade to llvm@6 for older compilers, which don't support the newer =
llvm@8.

=E2=80=94Ivan


--Apple-Mail=_2BF4C64F-69D8-4EB8-A9DC-56211E5A352C
Content-Disposition: attachment;
	filename=0001-gnu-rust-remove-debug-info-patch-thanks-to-newer-gdb.patch
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="0001-gnu-rust-remove-debug-info-patch-thanks-to-newer-gdb.patch"
Content-Transfer-Encoding: quoted-printable

=46rom=2046c10c35b1cb42b8b2063c567a0f45260aba55b4=20Mon=20Sep=2017=20=
00:00:00=202001=0AFrom:=20Ivan=20Petkov=20<ivanppetkov@gmail.com>=0A=
Date:=20Mon,=2017=20Jun=202019=2019:36:10=20-0700=0ASubject:=20[PATCH=20=
1/2]=20gnu:=20rust:=20remove=20debug-info=20patch=20thanks=20to=20newer=20=
gdb=0A=20version=0A=0A*=20gnu/local.mk:=20(dist_patch_DATA):=20Delete=0A=
%D%/packages/patches/rust-1.30-gdb-llvm.patch=0A*=20=
gnu/packages/rust.scm:=20(rust-1.30):=20Delete=20patch=20overrides.=0A=
(rust-1.31):=20Delete=20patch=20overrides.=0A---=0A=20gnu/local.mk=20=20=20=
=20=20=20=20=20=20=20|=20=201=20-=0A=20gnu/packages/rust.scm=20|=2011=20=
+----------=0A=202=20files=20changed,=201=20insertion(+),=2011=20=
deletions(-)=0A=0Adiff=20--git=20a/gnu/local.mk=20b/gnu/local.mk=0Aindex=20=
74d2bafa8d..65c8d98b44=20100644=0A---=20a/gnu/local.mk=0A+++=20=
b/gnu/local.mk=0A@@=20-1256,7=20+1256,6=20@@=20dist_patch_DATA=20=3D=09=09=
=09=09=09=09\=0A=20=20=20=
%D%/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch=20\=0A=
=20=20=20%D%/packages/patches/rust-bootstrap-stage0-test.patch=09=09\=0A=20=
=20=20%D%/packages/patches/rust-coresimd-doctest.patch=09=09\=0A-=20=20=
%D%/packages/patches/rust-1.30-gdb-llvm.patch=09=09=09\=0A=20=20=20=
%D%/packages/patches/rust-reproducible-builds.patch=09=09=20\=0A=20=20=20=
%D%/packages/patches/rxvt-unicode-escape-sequences.patch=09\=0A=20=20=20=
%D%/packages/patches/scalapack-blacs-mpi-deprecations.patch=09\=0Adiff=20=
--git=20a/gnu/packages/rust.scm=20b/gnu/packages/rust.scm=0Aindex=20=
9c8088b2f7..76a38736ac=20100644=0A---=20a/gnu/packages/rust.scm=0A+++=20=
b/gnu/packages/rust.scm=0A@@=20-871,10=20+871,7=20@@=20jemalloc=20=3D=20=
\""=20jemalloc=20"/lib/libjemalloc_pic.a"=20"\"=0A=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20(delete-file-recursively=20=
"src/llvm-emscripten")=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20(delete-file-recursively=20"src/tools/clang")=0A=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
(delete-file-recursively=20"src/tools/lldb")=0A-=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20#t))=0A-=20=20=20=20=20=20=20=20=20=
=20(patches=20(map=20search-patch=20=
'("rust-1.25-accept-more-detailed-gdb-lines.patch"=0A-=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20"rust-1.30-gdb-llvm.patch"=0A-=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20"rust-reproducible-builds.patch")))))=0A+=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20#t))))=0A=20=20=20=20=20=
=20=20(inputs=0A=20=20=20=20=20=20=20=20;;=20Use=20LLVM=207.0=0A=20=20=20=
=20=20=20=20=20(alist-replace=20"llvm"=20(list=20llvm)=0A@@=20-918,12=20=
+915,6=20@@=20jemalloc=20=3D=20\""=20jemalloc=20"/lib/libjemalloc_pic.a"=20=
"\"=0A=20=20=20=20=20=20=20=20=20=20=20=
"0sk84ff0cklybcp0jbbxcw7lk7mrm6kb6km5nzd6m64dy0igrlli")))=0A=20=20=20=20=20=
(package=0A=20=20=20=20=20=20=20(inherit=20base-rust)=0A-=20=20=20=20=20=20=
(source=0A-=20=20=20=20=20=20=20=20(origin=0A-=20=20=20=20=20=20=20=20=20=
=20(inherit=20(package-source=20base-rust))=0A-=20=20=20=20=20=20=20=20=20=
=20(patches=20(map=20search-patch=20=
'("rust-1.25-accept-more-detailed-gdb-lines.patch"=0A-=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20"rust-1.30-gdb-llvm.patch"=0A-=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20"rust-reproducible-builds.patch")))))=0A=20=20=20=20=20=
=20=20(arguments=0A=20=20=20=20=20=20=20=20(substitute-keyword-arguments=20=
(package-arguments=20base-rust)=0A=20=20=20=20=20=20=20=20=20=20=
((#:phases=20phases)=0A--=20=0A2.22.0=0A=0A=

--Apple-Mail=_2BF4C64F-69D8-4EB8-A9DC-56211E5A352C
Content-Disposition: attachment;
	filename=0002-gnu-rust-downgrade-older-versions-to-llvm-6.patch
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="0002-gnu-rust-downgrade-older-versions-to-llvm-6.patch"
Content-Transfer-Encoding: quoted-printable

=46rom=2075ff4398e5f430df37372dc2ed21c61f57fc8db1=20Mon=20Sep=2017=20=
00:00:00=202001=0AFrom:=20Ivan=20Petkov=20<ivanppetkov@gmail.com>=0A=
Date:=20Mon,=2017=20Jun=202019=2019:39:08=20-0700=0ASubject:=20[PATCH=20=
2/2]=20gnu:=20rust:=20downgrade=20older=20versions=20to=20llvm@6=0A=0A*=20=
gnu/packages/rust.scm:=20(rust-1.30):=20Remove=20llvm=20override.=0A---=0A=
=20gnu/packages/rust.scm=20|=204=20----=0A=201=20file=20changed,=204=20=
deletions(-)=0A=0Adiff=20--git=20a/gnu/packages/rust.scm=20=
b/gnu/packages/rust.scm=0Aindex=2076a38736ac..c83c8a6784=20100644=0A---=20=
a/gnu/packages/rust.scm=0A+++=20b/gnu/packages/rust.scm=0A@@=20-872,10=20=
+872,6=20@@=20jemalloc=20=3D=20\""=20jemalloc=20"/lib/libjemalloc_pic.a"=20=
"\"=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
(delete-file-recursively=20"src/tools/clang")=0A=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20=20=20=20=20=20=20=20=20=20(delete-file-recursively=20=
"src/tools/lldb")=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20=20=20#t))))=0A-=20=20=20=20=20=20(inputs=0A-=20=20=20=20=20=20=20=
;;=20Use=20LLVM=207.0=0A-=20=20=20=20=20=20=20(alist-replace=20"llvm"=20=
(list=20llvm)=0A-=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=
=20=20=20(package-inputs=20base-rust)))=0A=20=20=20=20=20=20=20=
(arguments=0A=20=20=20=20=20=20=20=20(substitute-keyword-arguments=20=
(package-arguments=20base-rust)=0A=20=20=20=20=20=20=20=20=20=20=
((#:phases=20phases)=0A--=20=0A2.22.0=0A=0A=

--Apple-Mail=_2BF4C64F-69D8-4EB8-A9DC-56211E5A352C--