X-Git-Url: https://git.tld-linux.org/?p=packages%2Frpm-tld-macros.git;a=blobdiff_plain;f=macros.rust;fp=macros.rust;h=3f61146aad9d1ae17ee44450c5cd5bdea1174e47;hp=e8992926669874bf164e770ab03767c392e0986c;hb=db2a9058457d123f0a30ac29e622a671a02543b8;hpb=2eb3b8233652e3dc3720c3699d7519e5ad6a6687

diff --git a/macros.rust b/macros.rust
index e899292..3f61146 100644
--- a/macros.rust
+++ b/macros.rust
@@ -2,22 +2,62 @@
 %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 \
+armv7-unknown-linux-gnueabihf\\\
+%endif\
+%ifarch armv7hnl\
+thumbv7neon-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 \\\
+	CC="%{__cc}" \\\
+	CXX="%{__cxx}" \\\
+	CFLAGS="%{rpmcppflags} %{rpmcflags}" \\\
+	CXXFLAGS="%{rpmcppflags} %{rpmcxxflags}" \\\
+	LDFLAGS="%{rpmldflags}" \\\
+	PKG_CONFIG_ALLOW_CROSS=1 \\\
 	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 \\\
+	CC="%{__cc}" \\\
+	CXX="%{__cxx}" \\\
+	CFLAGS="%{rpmcppflags} %{rpmcflags}" \\\
+	CXXFLAGS="%{rpmcppflags} %{rpmcxxflags}" \\\
+	LDFLAGS="%{rpmldflags}" \\\
+	PKG_CONFIG_ALLOW_CROSS=1 \\\
 	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}