From b513029829e3ac6b87cb1645e6914a5a15857612 Mon Sep 17 00:00:00 2001
From: Idris Kalp <idriskalp@gmail.com>
Date: Sat, 21 Nov 2020 03:34:56 +0300
Subject: [PATCH] rust build trial

---
 programming/language/rust/actions.py                  | 6 +++++-
 programming/language/rust/files/bootstrap-config.toml | 7 ++++++-
 programming/language/rust/pspec.xml                   | 4 +++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/programming/language/rust/actions.py b/programming/language/rust/actions.py
index a4230116ea..98ac446180 100755
--- a/programming/language/rust/actions.py
+++ b/programming/language/rust/actions.py
@@ -10,10 +10,14 @@ from pisi.actionsapi import pythonmodules
 from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
 
+WorkDir = "rustc-%s-src" %get.srcVERSION()
+crt_ver = "11.0.0"
 
 def build():
     shelltools.export("LC_ALL", "en_US.UTF-8")
-    shelltools.system("python ./x.py build")
+    shelltools.export("RUST_BACKTRACE", "1")
+    shelltools.export("RUST_COMPILER_RT_ROOT", "%s/%s/compiler-rt-%s.src" % (get.workDIR(), WorkDir, crt_ver))
+    shelltools.system("python ./x.py dist")
     
 
 def install():
diff --git a/programming/language/rust/files/bootstrap-config.toml b/programming/language/rust/files/bootstrap-config.toml
index 21cfa4b6aa..4bc33bed23 100644
--- a/programming/language/rust/files/bootstrap-config.toml
+++ b/programming/language/rust/files/bootstrap-config.toml
@@ -4,9 +4,14 @@ changelog-seen = 2
 link-shared = true
 
 [build]
-python = "python2.7"
+target = ["x86_64-unknown-linux-gnu"]
+cargo = "/usr/bin/cargo"
+rustc = "/usr/bin/rustc"
+python = "/usr/bin/python3"
 extended = true
 sanitizers = false
+profiler = true
+vendor = true
 
 [install]
 prefix = "/usr"
diff --git a/programming/language/rust/pspec.xml b/programming/language/rust/pspec.xml
index 0b9a5b4690..e0c95e4587 100755
--- a/programming/language/rust/pspec.xml
+++ b/programming/language/rust/pspec.xml
@@ -13,6 +13,7 @@
         <Summary>Systems programming language focused on safety, speed and concurrency</Summary>
         <Description>Systems programming language focused on safety, speed and concurrency</Description>
         <Archive sha1sum="a26f089d27c9cc283a7305fc8ece6b4674a036fd" type="targz">https://static.rust-lang.org/dist/rustc-1.48.0-src.tar.gz</Archive>
+        <Archive sha1sum="be3e79fb93cd99135643a191f27c49449bf9c0ee" type="tarxz" target="rustc-1.48.0-src">https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/compiler-rt-11.0.0.src.tar.xz</Archive>
         <AdditionalFiles>
             <AdditionalFile target="config.toml">bootstrap-config.toml</AdditionalFile>
         </AdditionalFiles>
@@ -30,8 +31,9 @@
             <Dependency>libssh2-devel</Dependency>
             <Dependency>gdb-devel</Dependency>
             <Dependency>curl-devel</Dependency>
-            <Dependency>python-devel</Dependency>
+            <Dependency>python3-devel</Dependency>
             <Dependency>libffi-devel</Dependency>
+            <Dependency>rust</Dependency>
         </BuildDependencies>
         <Patches>
             <!--Patch level="1">70163.patch</Patch-->