[packages/rpm-pld-macros] add %cargo_target/%cargo_targetdir/%cargo_objdir (2.011)

[atler]

commit a26c87f431d9f878b7bdd95f3ceff13e7af7c11b
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Jan 5 13:30:12 2022 +0100

    add %cargo_target/%cargo_targetdir/%cargo_objdir (2.011)
    
    pass %cargo_target explicitly on all archs

 macros.rust         | 32 +++++++++++++++++++++++++++++---
 rpm-pld-macros.spec |  2 +-
 2 files changed, 30 insertions(+), 4 deletions(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index 6507845..f055a4e 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	2.010
+%define		rpm_macros_rev	2.011
 %define		find_lang_rev	1.40
 # split into individual X_prov_ver if there is a reason to desync
 %define		prov_ver	4.15
diff --git a/macros.rust b/macros.rust
index 6ba25a3..c0d849e 100644
--- a/macros.rust
+++ b/macros.rust
@@ -2,6 +2,33 @@
 %rpmrustflags	%debuginforustflags
 %rust_arches	%{x8664} %{ix86} x32 aarch64 armv6hl armv7hl armv7hnl
 
+%cargo_target	\\\
+%ifarch i586\
+i586-unknown-linux-gnu\\\
+%endif\
+%ifarch i686 pentium3 pentium4 athlon\
+i686-unknown-linux-gnu\\\
+%endif\
+%ifarch %{x8664}\
+x86_64-unknown-linux-gnu\\\
+%endif\
+%ifarch x32\
+x86_64-unknown-linux-gnux32\\\
+%endif\
+%ifarch aarch64\
+aarch64-unknown-linux-gnu\\\
+%endif\
+%ifarch armv6hl\
+arm-unknown-linux-gnueabihf\\\
+%endif\
+%ifarch armv7hl armv7hnl\
+armv7-unknown-linux-gnueabihf\\\
+%endif\
+%{nil}
+
+%cargo_targetdir	target
+%cargo_objdir		%{?buildsubdir:%{_builddir}/%{buildsubdir}/}%{cargo_targetdir}/%{cargo_target}/%{!?debug:release}%{?debug:debug}
+
 %__cargo	/usr/bin/cargo
 %__cargo_common_opts	-v --offline
 %cargo_build \\\
@@ -11,9 +38,8 @@
 	RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}" \\\
 	%{?__jobs:CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-%{__jobs}}"} \\\
 	%{__cargo} %{__cargo_common_opts} build %{!?debug:--release} \\\
-%ifarch x32 \
-	--target x86_64-unknown-linux-gnux32 \\\
-%endif \
+	--target %{cargo_target} \\\
+	--target-dir %{cargo_targetdir} \\\
 %{nil}
 
 %cargo_install \\\
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/a26c87f431d9f878b7bdd95f3ceff13e7af7c11b