pool/rust
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fix libgit requirement during bootstrap.
Revert back to system LLVM (removes bcond)

OBS-URL: https://build.opensuse.org/request/show/679667
OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=189
This commit is contained in:
Luke Jones 2019-02-27 01:11:08 +00:00 committed by Git OBS Bridge
parent 5507ae4e89
commit 7f0bc74e16
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rust.spec
View File

@ -72,10 +72,6 @@
%bcond_without bundled_llvm
%endif
# System LLVM currently causes issues for rust when building FireFox
# so we will use the bundled LLVM for all builds anyway
%bcond_without bundled_llvm
# Debuginfo can exhaust memory on these architecture workers
%ifarch %{arm} %{ix86}
%define codegen_units --set rust.codegen-units=4
@ -89,15 +85,16 @@
# eliminate complain from RPMlint
%global nocomplain CPPFLAGS="%{optflags}"
# Cargo use system libs if not bootstrapping
# restircted only to libgit due to version changes causing with cargo rpm deps
%global cargo_ssh LIBSSH2_SYS_USE_PKG_CONFIG=1
%if !%with rust_bootstrap
%global cargo_git LIBGIT2_SYS_USE_PKG_CONFIG=1
%global cargo_ssh LIBSSH2_SYS_USE_PKG_CONFIG=1
# Must be exported before running x.py in both build and install
# If the environments between build and install and different,
# everything will be rebuilt during installation!
%global build_env_vars RUSTFLAGS="%{rustflags}" %{cargo_git} %{cargo_ssh} %{nocomplain}
%else
%global build_env_vars RUSTFLAGS="%{rustflags}" %{nocomplain}
%global build_env_vars RUSTFLAGS="%{rustflags}" %{cargo_ssh} %{nocomplain}
%endif
# enable the --with-rust_bootstrap flag
@ -131,7 +128,9 @@ BuildRequires: pkgconfig
BuildRequires: procps
BuildRequires: python3-base
BuildRequires: pkgconfig(libcurl)
%if !%with rust_bootstrap
BuildRequires: pkgconfig(libgit2) >= 0.23
%endif
BuildRequires: pkgconfig(libssh2) >= 1.4.3
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(zlib)