- rpm4 needs --whatprovides to resolve virtual required deps

[packages/rpm-pld-macros.git] / macros.rust

diff --git a/macros.rust b/macros.rust
index c0d849e707fd18205fd7a81468497d42b681f565..9ad61a05212520a09c04a6282d1e8f32bf48867b 100644 (file)
--- a/macros.rust
+++ b/macros.rust
@@ -2,7 +2,7 @@
 %rpmrustflags  %debuginforustflags
 %rust_arches   %{x8664} %{ix86} x32 aarch64 armv6hl armv7hl armv7hnl
 
-%cargo_target  \\\
+%rust_target   \\\
 %ifarch i586\
 i586-unknown-linux-gnu\\\
 %endif\
@@ -21,35 +21,44 @@ aarch64-unknown-linux-gnu\\\
 %ifarch armv6hl\
 arm-unknown-linux-gnueabihf\\\
 %endif\
-%ifarch armv7hl armv7hnl\
+%ifarch armv7hl \
 armv7-unknown-linux-gnueabihf\\\
 %endif\
+%ifarch armv7hnl\
+thumbv7neon-unknown-linux-gnueabihf\\\
+%endif\
 %{nil}
 
+%cargo_target  %rust_target
 %cargo_targetdir       target
-%cargo_objdir          %{?buildsubdir:%{_builddir}/%{buildsubdir}/}%{cargo_targetdir}/%{cargo_target}/%{!?debug:release}%{?debug:debug}
+%cargo_objdir          %{?buildsubdir:%{_builddir}/%{buildsubdir}/}%{cargo_targetdir}/%{rust_target}/%{!?debug:release}%{?debug:debug}
 
 %__cargo       /usr/bin/cargo
 %__cargo_common_opts   -v --offline
 %cargo_build \\\
-%ifarch x32 \
+       CC="%{__cc}" \\\
+       CXX="%{__cxx}" \\\
+       CFLAGS="%{rpmcppflags} %{rpmcflags}" \\\
+       CXXFLAGS="%{rpmcppflags} %{rpmcxxflags}" \\\
+       LDFLAGS="%{rpmldflags}" \\\
        PKG_CONFIG_ALLOW_CROSS=1 \\\
-%endif \
        RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}" \\\
        %{?__jobs:CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-%{__jobs}}"} \\\
        %{__cargo} %{__cargo_common_opts} build %{!?debug:--release} \\\
-       --target %{cargo_target} \\\
+       --target %{rust_target} \\\
        --target-dir %{cargo_targetdir} \\\
 %{nil}
 
 %cargo_install \\\
-%ifarch x32 \
+       CC="%{__cc}" \\\
+       CXX="%{__cxx}" \\\
+       CFLAGS="%{rpmcppflags} %{rpmcflags}" \\\
+       CXXFLAGS="%{rpmcppflags} %{rpmcxxflags}" \\\
+       LDFLAGS="%{rpmldflags}" \\\
        PKG_CONFIG_ALLOW_CROSS=1 \\\
-%endif \
        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 %{rust_target} \\\
+       --target-dir %{cargo_targetdir} \\\
 %{nil}