Accepting request 679979 from home:luke_nukem:branches:devel:languages:rust

- Use same version bootstrap as package source
- Fixes to build with correct LLVM for SLE and Leap releases
- Move export vars directly to where used.

OBS-URL: https://build.opensuse.org/request/show/679979
OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=192

_constraints

@@ -17,6 +17,9 @@
     </conditions>
     <hardware>
       <processors>2</processors>
+      <physicalmemory>
+        <size unit="G">4</size>
+      </physicalmemory>
       <disk>
         <size unit="G">15</size>
       </disk>

rust-1.31.1-aarch64-unknown-linux-gnu.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8926323bd0a69cfa13fc42a933ac290ef2c2ed2795e49a76aee6a8b15e0f5522
-size 117785172

rust-1.31.1-arm-unknown-linux-gnueabihf.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c24e6cd322bc3f23b3939b6738f72cb714814db97c2adb158fcfe3555a1ffce4
-size 124897320

rust-1.31.1-armv7-unknown-linux-gnueabihf.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2612d15507a90b17a212dc0cb95f13351fac0c9c0c52c3e13a947ffbcfc0e12e
-size 126152056

rust-1.31.1-i686-unknown-linux-gnu.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9f0877b2d8ec0ba0066a90fea267590603502e67269ebc2aa2d36e2fb050a5bc
-size 147063596

rust-1.31.1-powerpc64-unknown-linux-gnu.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:18adbc13b5fdb0d7796a512c6408257f488dec96c055916093a441f5fea474ad
-size 122297864

rust-1.31.1-powerpc64le-unknown-linux-gnu.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:39240ba479858199e2dfdd7e706fab41e7b30f5fe56198473aaf182124d91576
-size 125272712

rust-1.31.1-s390x-unknown-linux-gnu.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db675fb948fa4de2c6c59c8cd92764b49616c355c25c5b5e5b036e1c2b8267d5
-size 127867704

rust-1.31.1-x86_64-unknown-linux-gnu.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b2a13544161f6a5a5d9d4130f2c4ce8043c2d3a7cd429310a51080111fbf957a
-size 148394364

rust-1.32.0-aarch64-unknown-linux-gnu.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a530cfc8aadd2cec3b8c63dfb46c940ad8b4b18131641a3da1601ec380619f11
+size 116136352

rust-1.32.0-arm-unknown-linux-gnueabihf.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:456ea506cd920d3470ee935e239b1be2101abf21ec6547133fce8b0f80ee0448
+size 117758664

rust-1.32.0-armv7-unknown-linux-gnueabihf.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2e823316c841fe8459f49337fa0ca164df7b8a651e7b8fc4d3375c94766ac228
+size 119183916

rust-1.32.0-i686-unknown-linux-gnu.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:29c015ef1aa37f770e823fe7f000892448f9b5f2ca9ec381b6ad7b7a965b6054
+size 146763596

rust-1.32.0-powerpc64-unknown-linux-gnu.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:237665793c41d794d339d383010d477e8d99025c407bf956a3c52ea51b90814b
+size 120518816

rust-1.32.0-powerpc64le-unknown-linux-gnu.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:93a85671ac11446bbedef67941591b06b3151b866df12c3a71d5940068d40bd0
+size 124278796

rust-1.32.0-s390x-unknown-linux-gnu.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ca4b078f3a1c23221f726668a26682651f515fdd8ba57827c87ea41b811006e
+size 128857448

rust-1.32.0-x86_64-unknown-linux-gnu.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e7ee1fc3c6e2d2dec4bfdc0b38ecc3a80828655bdf6bb44d97c7a9ea76134f86
+size 147868652

rust.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb 27 21:39:35 UTC 2019 - jones_ld@protonmail.com
+
+- Use same version bootstrap as package source
+- Fixes to build with correct LLVM for SLE and Leap releases
+
 -------------------------------------------------------------------
 Wed Feb 27 02:38:54 UTC 2019 - Luke Jones <jones_ld@protonmail.com>
 

rust.spec

@@ -17,7 +17,7 @@
 #
 
 
-%global prev_rust 1.31.1
+%global prev_rust 1.32.0
 # some sub-packages are versioned independantly
 %global rustfmt_version 1.0.0
 %global rls_version 1.31.6
@@ -55,20 +55,12 @@
 # Will build with distro LLVM by default, but the following
 # versions do not have a version new enough, >= 6.0
 # add --without bundled_llvm option, i.e. enable bundled_llvm by default
-# Leap 15.0
+# Leap 15.0, SLE 15
-%if 0%{?sle_version} == 150000 && 0%{?is_opensuse}
+%if 0%{?sle_version} == 150000
 %bcond_without bundled_llvm
 %endif
-# Leap 42.3
+# Leap 42 to 42.3, SLE12 SP1 to SLE12 SP3
-%if 0%{?sle_version} == 120300 && 0%{?is_opensuse}
+%if 0%{?sle_version} >= 120000 && 0%{?sle_version} <= 123000
-%bcond_without bundled_llvm
-%endif
-# Leap 42.2
-%if 0%{?sle_version} == 120200 && 0%{?is_opensuse}
-%bcond_without bundled_llvm
-%endif
-# SLE Backports SP3 or less
-%if 0%{?sle_version} <= 120300 && 0%{?is_backports}
 %bcond_without bundled_llvm
 %endif