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

Merge pull request #11220 from Rmys/master

Browse Source 
rust pass 2
This commit is contained in:
Rmys
2022-12-24 20:00:59 +03:00
committed by GitHub
parent 559609ef91 c207950e74
commit 3472d51386
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programming/language/rust/actions.py
+10 -9
View File
@@ -22,28 +22,29 @@ WorkDir = "rustc-%s-src" %get.srcVERSION()
#At phase 2, rust will be built again with this newly built rust. #At phase 2, rust will be built again with this newly built rust.
#Before phase 2, the lines below will be commented out. #Before phase 2, the lines below will be commented out.
RustBinDir = "rust-%s-x86_64-unknown-linux-gnu" %get.srcVERSION() # RustBinDir = "rust-%s-x86_64-unknown-linux-gnu" %get.srcVERSION()
RustcDir = "%s/rustbin" %get.workDIR() # RustcDir = "%s/rustbin" %get.workDIR()
################################################################# #################################################################
def build(): def build():
#İkinci aşamada bu satırlar da yoruma çevrilecek. #İkinci aşamada bu satırlar da yoruma çevrilecek.
#At phase 2, these lines also will be commented out. #At phase 2, these lines also will be commented out.
shelltools.cd(RustBinDir) # shelltools.cd(RustBinDir)
shelltools.system("./install.sh --prefix=%s" %RustcDir) # shelltools.system("./install.sh --prefix=%s" %RustcDir)
shelltools.cd("..") # shelltools.cd("..")
pisitools.dosed("config.toml", "/usr/bin/cargo", RustcDir+"/bin/cargo") # pisitools.dosed("config.toml", "/usr/bin/cargo", RustcDir+"/bin/cargo")
pisitools.dosed("config.toml", "/usr/bin/rustc", RustcDir+"/bin/rustc") # pisitools.dosed("config.toml", "/usr/bin/rustc", RustcDir+"/bin/rustc")
#################################################### ####################################################
shelltools.export("LC_ALL", "en_US.UTF-8") shelltools.export("LC_ALL", "en_US.UTF-8")
shelltools.export("RUST_BACKTRACE", "1") shelltools.export("RUST_BACKTRACE", "1")
shelltools.system("python ./x.py build") shelltools.system("python3 ./x.py build")
def install(): def install():
shelltools.system("DESTDIR=%s python ./x.py install" % get.installDIR()) # shelltools.export("RUST_BACKTRACE", "1")
shelltools.system("DESTDIR=%s python3 ./x.py install" % get.installDIR())
#pisitools.insinto("/", "build/x86_64-unknown-linux-gnu/stage0/etc") #pisitools.insinto("/", "build/x86_64-unknown-linux-gnu/stage0/etc")
#pisitools.insinto("/usr", "build/x86_64-unknown-linux-gnu/stage0/bin") #pisitools.insinto("/usr", "build/x86_64-unknown-linux-gnu/stage0/bin")
programming/language/rust/files/bootstrap-config.toml
+3
View File
@@ -12,6 +12,8 @@ extended = true
sanitizers = false sanitizers = false
profiler = true profiler = true
vendor = true vendor = true
tools = ["cargo", "rls", "clippy", "rustfmt", "analysis", "src", "rust-demangler"]
# docs = false
[install] [install]
prefix = "/usr" prefix = "/usr"
@@ -24,6 +26,7 @@ debuginfo-level-std = 2
channel = "stable" channel = "stable"
rpath = false rpath = false
# backtrace-on-ice = true
codegen-tests = false codegen-tests = false
[target.x86_64-unknown-linux-gnu] [target.x86_64-unknown-linux-gnu]
programming/language/rust/pspec.xml
+2 -2
View File
@@ -15,12 +15,12 @@
<Archive sha1sum="c61bebe008f78739fe737c4198ed844d7286f9c4" type="targz">https://static.rust-lang.org/dist/rustc-1.66.0-src.tar.gz</Archive> <Archive sha1sum="c61bebe008f78739fe737c4198ed844d7286f9c4" type="targz">https://static.rust-lang.org/dist/rustc-1.66.0-src.tar.gz</Archive>
<!-- Not: İkinci aşamada aşağıdaki satıra ihtiyaç olmayacak. Yoruma çevrilebilir. --> <!-- 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. --> <!-- The line below will be unnecessary at phase 2, can be commented out. -->
<Archive sha1sum="a772ea6cd3264eade11613c0ca4aa70c9d89eee3" type="targz" target="rustc-1.66.0-src">https://static.rust-lang.org/dist/rust-1.66.0-x86_64-unknown-linux-gnu.tar.gz</Archive> <!-- <Archive sha1sum="a772ea6cd3264eade11613c0ca4aa70c9d89eee3" type="targz" target="rustc-1.66.0-src">https://static.rust-lang.org/dist/rust-1.66.0-x86_64-unknown-linux-gnu.tar.gz</Archive> -->
<AdditionalFiles> <AdditionalFiles>
<AdditionalFile target="config.toml">bootstrap-config.toml</AdditionalFile> <AdditionalFile target="config.toml">bootstrap-config.toml</AdditionalFile>
</AdditionalFiles> </AdditionalFiles>
<BuildDependencies> <BuildDependencies>
<Dependency versionFrom="1.64.0">rust</Dependency> <Dependency versionFrom="1.66.0">rust</Dependency>
<Dependency>perl</Dependency> <Dependency>perl</Dependency>
<Dependency versionFrom="14.0.6">llvm</Dependency> <Dependency versionFrom="14.0.6">llvm</Dependency>
<Dependency>cmake</Dependency> <Dependency>cmake</Dependency>