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

- Use the system's LLVM in SLE15-SP1.  That distribution has LLVM7,
  and we need to use it there, instead of any other version.
- Prevent auto-provides from being created for things under
  rustlibdir, so the RPM does not inadvertently have a Provides for a
  bundled LLVM and the Rust library files.
- Sync changes files between SLE and openSUSE, for ease of maintenance.

OBS-URL: https://build.opensuse.org/request/show/688403
OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=209
This commit is contained in:
Luke Jones
2019-03-25 20:52:49 +00:00
committed by Git OBS Bridge
parent 9dca7ce326
commit 5853a824ca
2 changed files with 62 additions and 30 deletions

View File

@@ -13,7 +13,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -57,12 +57,8 @@
# 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, SLE 15
%if 0%{?sle_version} == 150000
%bcond_without bundled_llvm
%endif
# Leap 42 to 42.3, SLE12 SP1 to SLE12 SP3
%if 0%{?sle_version} >= 120000 && 0%{?sle_version} <= 120400
# Leap 42 to 42.3, SLE12 SP1 to SLE12 SP3, Leap 15.0, SLE15 SP0
%if 0%{?sle_version} >= 120000 && 0%{?sle_version} <= 150000
%bcond_without bundled_llvm
%endif
@@ -80,6 +76,9 @@
# Use hardening ldflags.
%global rustflags -Clink-arg=-Wl,-z,relro,-z,now
# Exclude implicitly-scanned Provides, especially the libLLVM.so ones:
%global __provides_exclude_from ^%{rustlibdir}/.*$
Name: rust
Version: %{version_current}
Release: 0