Merge pull request #12168 from Rmys/master

rust-1.77.0 rebuild

programming/language/rust/actions.py

@@ -22,19 +22,19 @@ WorkDir = "rustc-%s-src" %get.srcVERSION()
 #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()
+# 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.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")

programming/language/rust/files/0002-bootstrap-Change-bash-completion-dir.patch

@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Thu, 13 Jul 2023 21:16:53 +0200
+Subject: [PATCH] bootstrap: Change bash-completion dir
+
+---
+ src/bootstrap/dist.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
+index 05e106637d74..426b1277fb23 100644
+--- a/src/bootstrap/dist.rs
++++ b/src/bootstrap/dist.rs
+@@ -1073,7 +1073,7 @@ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
+         tarball.add_file(etc.join("_cargo"), "share/zsh/site-functions", 0o644);
+         tarball.add_renamed_file(
+             etc.join("cargo.bashcomp.sh"),
+-            "src/etc/bash_completion.d",
++            "share/bash-completion/completions",
+             "cargo",
+         );
+         tarball.add_dir(etc.join("man"), "share/man/man1");

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

@@ -1,3 +1,4 @@
+profile = "user"
 changelog-seen = 2
 
 [llvm]
@@ -12,8 +13,8 @@ extended = true
 sanitizers = false
 profiler = true
 vendor = true
-tools = ["cargo", "rls", "clippy", "rustfmt", "analysis", "src", "rust-demangler"]
-# docs = false
+tools = ["cargo", "rls", "clippy",  "rustdoc", "rustfmt", "analysis", "rust-analyzer", "src", "rust-demangler"]
+docs = false
 
 [install]
 prefix = "/usr"

programming/language/rust/pspec.xml

@@ -15,12 +15,12 @@
         <Archive sha1sum="aa25233c3f6e231a55fe060a95ad4d4236efc114" type="targz">https://static.rust-lang.org/dist/rustc-1.71.0-src.tar.gz</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="3d001d123999312c1af9caff8162b9adc6546e35" type="targz" target="rustc-1.71.0-src">https://static.rust-lang.org/dist/rust-1.71.0-x86_64-unknown-linux-gnu.tar.gz</Archive>
+<!--         <Archive sha1sum="3d001d123999312c1af9caff8162b9adc6546e35" type="targz" target="rustc-1.71.0-src">https://static.rust-lang.org/dist/rust-1.71.0-x86_64-unknown-linux-gnu.tar.gz</Archive> -->
         <AdditionalFiles>
             <AdditionalFile target="config.toml">bootstrap-config.toml</AdditionalFile>
         </AdditionalFiles>
         <BuildDependencies>
-<!--             <Dependency versionFrom="1.71.0">rust</Dependency> -->
+            <Dependency versionFrom="1.71.0">rust</Dependency>
             <Dependency>perl</Dependency>
             <Dependency versionFrom="15.0.7">llvm</Dependency>
             <Dependency>cmake</Dependency>
@@ -39,7 +39,7 @@
         </BuildDependencies>
         <Patches>
             <!--Patch level="1">70163.patch</Patch-->
-<!--             <Patch level="1">0001-WIP-minimize-the-rust-std-component.patch</Patch> -->
+            <Patch level="1">0002-bootstrap-Change-bash-completion-dir.patch</Patch>
         </Patches>
     </Source>
 
@@ -80,7 +80,7 @@
         <Update release="30">
             <Date>2023-07-21</Date>
             <Version>1.71.0</Version>
-            <Comment>Version bump</Comment>
+            <Comment>Version bump.</Comment>
             <Name>Mustafa Cinasal</Name>
             <Email>muscnsl@gmail.com</Email>
         </Update>