decathorpe/rust2rpm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

macros: remove support for target-dir

Browse source 
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
Igor Gnatenko 2018-06-22 21:53:09 +02:00
parent c9ce952e26
commit 80237720ae
No known key found for this signature in database
GPG key ID: 695714BD1BBC5F4C
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
data/macros.cargo
View file

@ -35,30 +35,29 @@ EOF\
%endif \ %endif \
) )
%__cargo_parse_opts(t:naf:) %{shrink:\ %__cargo_parse_opts(naf:) %{shrink:\
%{-f:%{-a:%{error:Can't specify both -f(%{-f*}) and -a}}} \ %{-f:%{-a:%{error:Can't specify both -f(%{-f*}) and -a}}} \
%{-t:--target-dir %{-t*}} \
%{-n:--no-default-features} \ %{-n:--no-default-features} \
%{-a:--all-features} \ %{-a:--all-features} \
%{-f:--features %{-f*}} \ %{-f:--features %{-f*}} \
%{nil} %{nil}
} }
%cargo_build(t:naf:) %{shrink:\ %cargo_build(naf:) %{shrink:\
%{__cargo} build \ %{__cargo} build \
%{__cargo_common_opts} \ %{__cargo_common_opts} \
--release \ --release \
%{__cargo_parse_opts %{-t:-t%{-t*}} %{-n} %{-a} %{-f:-f%{-f*}}} \ %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \
%* \ %* \
} }
%cargo_test(t:naf:) %{shrink:\ %cargo_test(naf:) %{shrink:\
%{__cargo} test \ %{__cargo} test \
%{__cargo_common_opts} \ %{__cargo_common_opts} \
--release \ --release \
--no-fail-fast \ --no-fail-fast \
%{__cargo_parse_opts %{-t:-t%{-t*}} %{-n} %{-a} %{-f:-f%{-f*}}} \ %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}} \
%* \ %* \
} }
%cargo_install(t:naf:) (\ %cargo_install(t:naf:) (\
@ -75,7 +74,7 @@ if %__cargo_is_lib; then \
echo '{"files":{},"package":""}' > $REG_DIR/.cargo-checksum.json \ echo '{"files":{},"package":""}' > $REG_DIR/.cargo-checksum.json \
fi \ fi \
if %__cargo_is_bin; then \ if %__cargo_is_bin; then \
%{shrink:%{-t:CARGO_TARGET_DIR=%{-t*}} %{__cargo} install \ %{shrink:%{__cargo} install \
%{__cargo_common_opts} \ %{__cargo_common_opts} \
--path . \ --path . \
--root %{buildroot}%{_prefix} \ --root %{buildroot}%{_prefix} \