Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17390 from Rmys/master

Browse Source 
rust-1.90.0
This commit is contained in:
Rmys
2025-09-23 12:36:22 +03:00
committed by GitHub
parent 076c6023a6 ae7f11ce2e
commit 571a2d2a48
5 changed files with 78 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programming/language/rust/actions.py
Executable → Regular
+11 -7
View File
@@ -22,19 +22,23 @@ 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()
# Farklı sürüm ile derlenmek isterse aç kendi sürümünü kapat
# RustBinDir = "rust-1.89.0-x86_64-unknown-linux-gnu"
# Kendi sürümü ile derleme
# 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/0008-bootstrap-Workaround-for-system-stage0.patch
+26
View File
@@ -0,0 +1,26 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
Date: Thu, 7 Aug 2025 19:01:26 +0200
Subject: [PATCH] bootstrap: Workaround for system stage0
See: https://github.com/rust-lang/rust/issues/143735
---
src/bootstrap/src/core/build_steps/compile.rs | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
index 30cbcc05c429..0b5f1b55a43e 100644
--- a/src/bootstrap/src/core/build_steps/compile.rs
+++ b/src/bootstrap/src/core/build_steps/compile.rs
@@ -796,7 +796,10 @@ fn run(self, builder: &Builder<'_>) {
let _ = fs::remove_dir_all(sysroot.join("lib/rustlib/src/rust"));
}
- builder.cp_link_r(&builder.initial_sysroot.join("lib"), &sysroot.join("lib"));
+ builder.cp_link_r(
+ &builder.initial_sysroot.join("lib/rustlib"),
+ &sysroot.join("lib/rustlib"),
+ );
} else {
if builder.download_rustc() {
// Ensure there are no CI-rustc std artifacts.
programming/language/rust/files/0009-bootstrap-Workaround-for-1.90.0-stage0.patch
+34
View File
@@ -0,0 +1,34 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
Date: Fri, 19 Sep 2025 17:42:45 +0200
Subject: [PATCH] bootstrap: Workaround for 1.90.0 stage0
See: https://github.com/rust-lang/rust/issues/143765
---
src/bootstrap/src/utils/helpers.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bootstrap/src/utils/helpers.rs b/src/bootstrap/src/utils/helpers.rs
index eb00ed566c2d..86b3358a22b7 100644
--- a/src/bootstrap/src/utils/helpers.rs
+++ b/src/bootstrap/src/utils/helpers.rs
@@ -430,17 +430,17 @@ pub fn linker_flags(
// cfg(bootstrap) - remove the stage 0 check after updating the bootstrap compiler:
// `-Clinker-features` has been stabilized.
if stage == 0 {
- args.push("-Zlinker-features=+lld".to_string());
+ args.push("-Clinker-features=+lld".to_string());
} else {
args.push("-Clinker-features=+lld".to_string());
}
args.push("-Zunstable-options".to_string());
}
LldMode::SelfContained => {
// cfg(bootstrap) - remove the stage 0 check after updating the bootstrap compiler:
// `-Clinker-features` has been stabilized.
if stage == 0 {
- args.push("-Zlinker-features=+lld".to_string());
+ args.push("-Clinker-features=+lld".to_string());
} else {
args.push("-Clinker-features=+lld".to_string());
}
programming/language/rust/files/bootstrap-config.toml
+3
View File
@@ -1,6 +1,8 @@
profile = "user"
# changelog-seen = 2
change-id = 144675
[llvm]
link-shared = true
@@ -30,6 +32,7 @@ rpath = false
lld = false
use-lld = "external"
llvm-bitcode-linker = false
# backtrace-on-ice = true
programming/language/rust/pspec.xml
Executable → Regular
+4 -3
View File
@@ -15,12 +15,12 @@
<Archive sha1sum="1b4ba230854437649e24fc68de0c64560101cc08" type="targz">https://static.rust-lang.org/dist/rustc-1.90.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="70fccd40b0a6d1df348a448894ae9e3b4f561849" type="targz" target="rustc-1.90.0-src">https://static.rust-lang.org/dist/rust-1.90.0-x86_64-unknown-linux-gnu.tar.gz</Archive>
<!-- <Archive sha1sum="c766649421cf41fb42b26b0157e9e787eb6274f4" type="targz" target="rustc-1.90.0-src">https://static.rust-lang.org/dist/rust-1.89.0-x86_64-unknown-linux-gnu.tar.gz</Archive> -->
<AdditionalFiles>
<AdditionalFile target="config.toml">bootstrap-config.toml</AdditionalFile>
</AdditionalFiles>
<BuildDependencies>
<Dependency versionFrom="1.88.0">rust</Dependency>
<Dependency versionFrom="1.90.0">rust</Dependency>
<Dependency>perl</Dependency>"
<Dependency versionFrom="15.0.7">llvm</Dependency>
<Dependency>lld-devel</Dependency>
@@ -41,7 +41,8 @@
<Dependency>llvm-clang-devel</Dependency>
</BuildDependencies>
<Patches>
<!--Patch level="1">70163.patch</Patch-->
<Patch level="1">0008-bootstrap-Workaround-for-system-stage0.patch</Patch>
<Patch level="1">0009-bootstrap-Workaround-for-1.90.0-stage0.patch</Patch>
<!-- <Patch level="1">0002-bootstrap-Change-bash-completion-dir.patch</Patch> -->
</Patches>
</Source>