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

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

Browse Source 
- Put each exported environment variable in a separate line so the
  specfile will work on SLE SP0/SP1/SP2.

OBS-URL: https://build.opensuse.org/request/show/679672
OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=190
This commit is contained in:
Luke Jones 2019-02-27 02:30:38 +00:00 committed by Git OBS Bridge
parent 7f0bc74e16
commit 2292765355
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rust.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Feb 27 02:12:17 UTC 2019 - Federico Mena Quintero <federico@suse.com>
- Put each exported environment variable in a separate line so the
specfile will work on SLE SP0/SP1/SP2.
-------------------------------------------------------------------
Sun Feb 24 09:40:06 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

22
rust.spec
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/
#
@ -92,9 +92,9 @@
# 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}
%global rustc_flags RUSTFLAGS="%{rustflags}"
%else
%global build_env_vars RUSTFLAGS="%{rustflags}" %{cargo_ssh} %{nocomplain}
%global rustc_flags RUSTFLAGS="%{rustflags}"
%endif
# enable the --with-rust_bootstrap flag
@ -106,7 +106,7 @@ Release: 0
Summary: A systems programming language
License: MIT OR Apache-2.0
Group: Development/Languages/Rust
URL: https://www.rust-lang.org
Url: https://www.rust-lang.org
Source0: %{dl_url}/rustc-%{version}-src.tar.xz
Source99: %{name}-rpmlintrc
Source100: %{dl_url}/rust-%{prev_rust}-x86_64-unknown-linux-gnu.tar.xz
@ -422,7 +422,12 @@ fi
# in sync!
# If the environments between build and install and different,
# everything will be rebuilt during installation!
export %{build_env_vars}
export %{rustc_flags}
%if !%with rust_bootstrap
export %{cargo_git}
%endif
export %{cargo_ssh}
export %{nocomplain}
./x.py build -v
./x.py doc -v
@ -433,7 +438,12 @@ export %{build_env_vars}
# in sync!
# If the environments between build and install and different,
# everything will be rebuilt during installation!
export %{build_env_vars}
export %{rustc_flags}
%if !%with rust_bootstrap
export %{cargo_git}
%endif
export %{cargo_ssh}
export %{nocomplain}
DESTDIR=%{buildroot} ./x.py install
DESTDIR=%{buildroot} ./x.py install src