allow cross compilation in pkg_config crate on x32; rel 2

diff --git a/macros.rust b/macros.rust
index e8992926669874bf164e770ab03767c392e0986c..6ba25a30bcf521cbc7d79c75139825b6dee57ff7 100644 (file)
--- a/macros.rust
+++ b/macros.rust
@@ -5,6 +5,9 @@
 %__cargo       /usr/bin/cargo
 %__cargo_common_opts   -v --offline
 %cargo_build \\\
+%ifarch x32 \
+       PKG_CONFIG_ALLOW_CROSS=1 \\\
+%endif \
        RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}" \\\
        %{?__jobs:CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-%{__jobs}}"} \\\
        %{__cargo} %{__cargo_common_opts} build %{!?debug:--release} \\\
@@ -14,6 +17,9 @@
 %{nil}
 
 %cargo_install \\\
+%ifarch x32 \
+       PKG_CONFIG_ALLOW_CROSS=1 \\\
+%endif \
        RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}" \\\
        %{?__jobs:CARGO_BUILD_JOBS="${CARGO_BUILD_JOBS:-%{__jobs}}"} \\\
        %{__cargo} %{__cargo_common_opts} install \\\

diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index ac790d77c559a86b407dc38cd82295f60654d3d7..0cc8cc00a24f929209c94c5873d392e93e87d6dc 100644 (file)
--- 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:       1
+Release:       2
 License:       GPL v2+
 Group:         Development/Building
 Source0:       macros.pld