From d0b58959bcbf46e7fd0462bbdcfb6aa9e61d69d8 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Mon, 16 Apr 2018 18:52:39 +0300
Subject: [PATCH] rust-1.25.0:ver.bump

---
 programming/language/rust/actions.py          | 12 ++++----
 .../language/rust/files/bootstrap-config.toml | 18 +++++------
 programming/language/rust/pspec.xml           | 30 +++++++++++++++++--
 3 files changed, 42 insertions(+), 18 deletions(-)
 mode change 100755 => 100644 programming/language/rust/files/bootstrap-config.toml

diff --git a/programming/language/rust/actions.py b/programming/language/rust/actions.py
index e696900a55..aa63583287 100755
--- a/programming/language/rust/actions.py
+++ b/programming/language/rust/actions.py
@@ -12,14 +12,16 @@ from pisi.actionsapi import get
 
 
 def build():
-    shelltools.system("python ./x.py --verbose")
+    shelltools.system("python ./x.py build")
     
 
 def install():
-    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/lib")
-    pisitools.insinto("/usr", "build/x86_64-unknown-linux-gnu/stage0/share")
+    shelltools.system("DESTDIR=%s python ./x.py install" % get.installDIR())
+    
+    #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/lib")
+    #pisitools.insinto("/usr", "build/x86_64-unknown-linux-gnu/stage0/share")
     #pisitools.insinto("/usr", "build/x86_64-unknown-linux-gnu/stage0/manifest.in")
         
     #pisitools.dodoc("LICENSE","AUTHORS","README*")
diff --git a/programming/language/rust/files/bootstrap-config.toml b/programming/language/rust/files/bootstrap-config.toml
old mode 100755
new mode 100644
index 5abaa5fc75..fe49ef59a2
--- a/programming/language/rust/files/bootstrap-config.toml
+++ b/programming/language/rust/files/bootstrap-config.toml
@@ -1,25 +1,21 @@
+[llvm]
+ninja = true
+
 [build]
 python = "python2.7"
 extended = true
-# Verbosity level: 0 == not verbose, 1 == verbose, 2 == very verbose
 verbose = 0
-# Build the sanitizer runtimes
-#sanitizers = false
+sanitizers = false
 
 [install]
 prefix = "/usr"
 
 [rust]
 codegen-units = 0
-debuginfo = true
 
-# Whether or not line number debug information is emitted
-#debuginfo-lines = false
+debuginfo = true
+# debuginfo-lines = true
 
 channel = "stable"
 
-[target.x86_64-unknown-linux-gnu]
-llvm-config = "/usr/bin/llvm-config"
-
-[target.i686-unknown-linux-gnu]
-llvm-config = "/usr/bin/llvm-config"
+rpath = false
diff --git a/programming/language/rust/pspec.xml b/programming/language/rust/pspec.xml
index 34a1bf7e24..1c5768b954 100755
--- a/programming/language/rust/pspec.xml
+++ b/programming/language/rust/pspec.xml
@@ -12,12 +12,27 @@
         <IsA>app</IsA>
         <Summary>Systems programming language focused on safety, speed and concurrency</Summary>
         <Description>Systems programming language focused on safety, speed and concurrency</Description>
-        <Archive sha1sum="f835d72bc26ee6f25f6e5d6783b424fc9b904c9e" type="targz">https://static.rust-lang.org/dist/rustc-1.21.0-src.tar.gz</Archive>
+        <Archive sha1sum="8a8d11a5b9f836025d0790f3d03606ad1e7acd3c" type="targz">https://static.rust-lang.org/dist/rustc-1.25.0-src.tar.gz</Archive>
         <AdditionalFiles>
             <AdditionalFile target="config.toml">bootstrap-config.toml</AdditionalFile>
         </AdditionalFiles>
+        <BuildDependencies>
+            <Dependency>perl</Dependency>
+            <Dependency>cmake</Dependency>
+            <Dependency>ninja</Dependency>
+            <Dependency>ocaml</Dependency>
+            <Dependency>valgrind</Dependency>
+            <Dependency>zlib-devel</Dependency>
+            <Dependency>glibc-devel</Dependency>
+            <Dependency>libxml2-devel</Dependency>
+            <Dependency>openssl-devel</Dependency>
+            <Dependency>libssh2-devel</Dependency>
+            <Dependency>curl-devel</Dependency>
+            <Dependency>python-devel</Dependency>
+            <Dependency>libffi-devel</Dependency>
+        </BuildDependencies>
         <Patches>
-            <Patch>0001-librustc_llvm-build-Force-link-against-libffi.patch</Patch>
+<!--             <Patch>0001-librustc_llvm-build-Force-link-against-libffi.patch</Patch> -->
         </Patches>
        
     </Source>
@@ -26,7 +41,11 @@
         <Name>rust</Name>
         
         <RuntimeDependencies>
+            <Dependency>curl</Dependency>
+            <Dependency>zlib</Dependency>
             <Dependency>libgcc</Dependency>
+            <Dependency>libssh2</Dependency>
+            <Dependency>openssl</Dependency>
         </RuntimeDependencies>
         
         <Files>
@@ -42,6 +61,13 @@
     </Package>
 
     <History>
+        <Update release="3">
+            <Date>2018-04-16</Date>
+            <Version>1.25.0</Version>
+            <Comment>Version Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Update>
         <Update release="2">
             <Date>2017-11-13</Date>
             <Version>1.21.0</Version>