Merge pull request #8850 from IdrisKalp/master

rust 1.48.0, phase 1

programming/language/rust/actions.py

@@ -11,13 +11,35 @@ from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
 
 WorkDir = "rustc-%s-src" %get.srcVERSION()
-crt_ver = "11.0.0"
+
+### ÖNEMLİ NOT: ###
+#LLVM yükseltmelerinden sonra, ilk aşama olarak rust, manuel indirdiğimiz binary rust paketi ile derlenecek. Bu birinci aşama olacak.
+#İkinci aşamada ise derlediğimiz bu rust ile rust tekrar derlenecek.
+#İkinci aşamada aşağıdaki satırlar yoruma çevrilecek.
+
+### IMPORTANT NOTE ###
+#After upgrading LLVM, rust will be built via manually downloaded binary rust distro. This will be phase 1.
+#At phase 2, rust will be built again with this newly built rust.
+#Before phase 2, the lines below will be commented out.
+
+RustBinDir = "rust-%s-x86_64-unknown-linux-gnu" %get.srcVERSION()
+RustcDir = "%s/rustbin" %get.workDIR()
+
+#################################################################
 
 def build():
+    #İkinci aşamada bu satırlar da yoruma çevrilecek.
+    #At phase 2, these lines also will be commented out.
+    shelltools.cd(RustBinDir)
+    shelltools.system("./install.sh --prefix=%s" %RustcDir)
+    shelltools.cd("..")
+    pisitools.dosed("config.toml", "/usr/bin/cargo", RustcDir+"/bin/cargo")
+    pisitools.dosed("config.toml", "/usr/bin/rustc", RustcDir+"/bin/rustc")
+    ####################################################
+    
     shelltools.export("LC_ALL", "en_US.UTF-8")
     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")
-    shelltools.system("python ./x.py build")
     
 
 def install():

programming/language/rust/files/bootstrap-config.toml

@@ -6,6 +6,8 @@ link-shared = true
 [build]
 target = ["x86_64-unknown-linux-gnu"]
 python = "/usr/bin/python3"
+cargo = "/usr/bin/cargo"
+rustc = "/usr/bin/rustc"
 extended = true
 sanitizers = false
 profiler = true

programming/language/rust/pspec.xml

@@ -13,11 +13,14 @@
         <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>
+        <!-- Not: İkinci aşamada aşağıdaki satıra ihtiyaç olmayacak. Yoruma çevrilebilir. -->
+        <!-- The line below will be unnecessary at phase 2, can be commented out. -->
+        <Archive sha1sum="f0615a346a5db786a05b3e9ea45ef3ce5c86e5fb" type="targz" target="rustc-1.48.0-src">https://static.rust-lang.org/dist/rust-1.48.0-x86_64-unknown-linux-gnu.tar.gz</Archive>
         <AdditionalFiles>
             <AdditionalFile target="config.toml">bootstrap-config.toml</AdditionalFile>
         </AdditionalFiles>
         <BuildDependencies>
+<!--             <Dependency>rust</Dependency> -->
             <Dependency>perl</Dependency>
             <Dependency versionFrom="11.0.0">llvm</Dependency>
             <Dependency>cmake</Dependency>