commit 23736eab856833e0056b9f269dcca9c54532b7b9
Author: Jan Palus <[email protected]>
Date: Mon Jan 24 11:33:13 2022 +0100
use %cargo_target/%cargo_targetdir in %cargo_install; rel 5
macros.rust | 5 ++---
rpm-pld-macros.spec | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index f57969d..864ce9b 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -6,7 +6,7 @@ Summary: PLD Linux RPM macros
Summary(pl.UTF-8): Makra RPM dla Linuksa PLD
Name: rpm-pld-macros
Version: %{rpm_macros_rev}
-Release: 4
+Release: 5
License: GPL v2+
Group: Development/Building
Source0: macros.pld
diff --git a/macros.rust b/macros.rust
index 1c8a86e..3f61146 100644
--- a/macros.rust
+++ b/macros.rust
@@ -58,7 +58,6 @@ thumbv7neon-unknown-linux-gnueabihf\\\
RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}" \\\
%{?__jobs:CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-%{__jobs}}"} \\\
%{__cargo} %{__cargo_common_opts} install \\\
-%ifarch x32 \
- --target x86_64-unknown-linux-gnux32 \\\
-%endif \
+ --target %{cargo_target} \\\
+ --target-dir %{cargo_targetdir} \\\
%{nil}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/23736eab856833e0056b9f269dcca9c54532b7b9
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
