[packages/rpm-pld-macros] allow cross compilation in pkg_config crate on x32; rel 2

atler atler at pld-linux.org
Wed Jun 30 16:46:26 CEST 2021


commit 11d6d3bca332f1c95478071c7d6230d4aac98d88
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Jun 30 16:44:05 2021 +0200

    allow cross compilation in pkg_config crate on x32; rel 2

 macros.rust         | 6 ++++++
 rpm-pld-macros.spec | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index ac790d7..0cc8cc0 100644
--- 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
diff --git a/macros.rust b/macros.rust
index e899292..6ba25a3 100644
--- 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 \\\
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list