add %cargo_target/%cargo_targetdir/%cargo_objdir (2.011)

pass %cargo_target explicitly on all archs

diff --git a/macros.rust b/macros.rust
index 6ba25a30bcf521cbc7d79c75139825b6dee57ff7..c0d849e707fd18205fd7a81468497d42b681f565 100644 (file)
--- 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 \\\

diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index 6507845d40272e6431db92ca3fb96a51391bc356..f055a4e5b1c4cfd973d90bce1d00aa6af2766811 100644 (file)
--- 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