[packages/cargo-c] - try with x32

qboosh qboosh at pld-linux.org
Sun Apr 25 15:57:56 CEST 2021


commit b9431a50d9a26f52ce2286348fbe22c9f224b543
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Apr 25 15:59:24 2021 +0200

    - try with x32

 cargo-c.spec | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/cargo-c.spec b/cargo-c.spec
index abed1aa..9385ffa 100644
--- a/cargo-c.spec
+++ b/cargo-c.spec
@@ -23,8 +23,15 @@ BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig
 BuildRequires:	rust
 BuildRequires:	zlib-devel
+ExclusiveArch:	%{ix86} %{x8664} x32 aarch64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%ifarch	x32
+%define		target_opt	--target x86_64-unknown-linux-gnux32
+%else
+%define		target_opt	%{nil}
+%endif
+
 %description
 Cargo subcommands to build and install C-ABI compatible dynamic and
 static libraries.
@@ -37,7 +44,7 @@ bibliotek dynamicznych i statycznych.
 %setup -q -b1
 
 # bundled:
-# curl 1.71.1 vendor/curl-sys/curl
+# curl 7.71.1 vendor/curl-sys/curl
 # libgit2 1.0.1 vendor/libgit2-sys/libgit2
 # nghttp2 1.33.90 vendor/libnghttp2-sys/nghttp2 (but system nghttp2 is not supported in rust)
 # libssh 1.9.0 vendor/libssh2-sys/libssh2
@@ -59,14 +66,17 @@ EOF
 export CARGO_HOME="$(pwd)/.cargo"
 export LIBSSH2_SYS_USE_PKG_CONFIG=1
 
-cargo -vv build --release --frozen
+cargo -vv build --release --frozen %{target_opt}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 export CARGO_HOME="$(pwd)/.cargo"
 export LIBSSH2_SYS_USE_PKG_CONFIG=1
 
-cargo -vv install --frozen --path . --root $RPM_BUILD_ROOT%{_prefix}
+cargo -vv install --frozen %{target_opt} \
+	--path . \
+	--root $RPM_BUILD_ROOT%{_prefix}
+
 %{__rm} $RPM_BUILD_ROOT%{_prefix}/.crates*
 
 %clean
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cargo-c.git/commitdiff/b9431a50d9a26f52ce2286348fbe22c9f224b543



More information about the pld-cvs-commit mailing list