rpm/rust
SHA256
1
0
Fork 0
forked from pool/rust
Code Pull Requests Activity

Accepting request 680182 from home:federico-mena:branches:devel:languages:rust

Browse Source 
- Use cmake3, not cmake, in SLE-12 SP2 and earlier.  The stock cmake
  package there was 2.x, and building llvm requires cmake 3.5.

OBS-URL: https://build.opensuse.org/request/show/680182
OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=193
This commit is contained in:
Luke Jones
2019-02-28 20:04:41 +00:00
committed by Git OBS Bridge
parent 1855fcb516
commit 54534c90f2
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rust.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Feb 28 17:08:08 UTC 2019 - Federico Mena Quintero <federico@suse.com>
- Use cmake3, not cmake, in SLE-12 SP2 and earlier. The stock cmake
package there was 2.x, and building llvm requires cmake 3.5.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 27 21:39:35 UTC 2019 - jones_ld@protonmail.com Wed Feb 27 21:39:35 UTC 2019 - jones_ld@protonmail.com

8
rust.spec
View File

@@ -78,7 +78,6 @@
# Use hardening ldflags. # Use hardening ldflags.
%global rustflags -Clink-arg=-Wl,-z,relro,-z,now %global rustflags -Clink-arg=-Wl,-z,relro,-z,now
Name: rust Name: rust
Version: 1.32.0 Version: 1.32.0
Release: 0 Release: 0
@@ -98,7 +97,14 @@ Source106: %{dl_url}/rust-%{prev_rust}-powerpc64le-unknown-linux-gnu.tar.xz
Source107: %{dl_url}/rust-%{prev_rust}-s390x-unknown-linux-gnu.tar.xz Source107: %{dl_url}/rust-%{prev_rust}-s390x-unknown-linux-gnu.tar.xz
# PATCH-FIX-OPENSUSE: edit src/librustc_llvm/build.rs to ignore GCC incompatible flag # PATCH-FIX-OPENSUSE: edit src/librustc_llvm/build.rs to ignore GCC incompatible flag
Patch0: ignore-Wstring-conversion.patch Patch0: ignore-Wstring-conversion.patch
# Leap 42 to 42.3, SLE12 SP1, SP2
%if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 123000
# In these distros cmake is 2.x, so we need cmake3 for building llvm.
BuildRequires: cmake3
%else
# cmake got upgraded to 3.5 in SLE-12 SP2
BuildRequires: cmake BuildRequires: cmake
%endif
BuildRequires: curl BuildRequires: curl
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++