- add x32

diff --git a/cargo.spec b/cargo.spec
index 1e49740a6ec523e383c793e7a753903de646fe13..094cfe27dd77b4c808b94daa2631f5bd581f9bf2 100644 (file)
--- a/cargo.spec
+++ b/cargo.spec
@@ -27,6 +27,7 @@ Source3:      https://static.rust-lang.org/dist/%{name}-%{cargo_bootstrap}-i686-unkno
 # PLD: using sources vendored by Fedora
 Source4:       https://src.fedoraproject.org/repo/pkgs/cargo/%{name}-%{version}-vendor.tar.xz/sha512/301fdf0ceea482120fbf4b5037bc2dfe18cd3c39f42eaca4464ed1f356093f0f9fb3dae48d1fd72b964fd5f4c6be21fa79e548d0480a1834afe55c2d4e50bac7/%{name}-%{version}-vendor.tar.xz
 # Source4-md5: 378dceb15dd78628d8664b7ca219f842
+Patch0:                x32.patch
 URL:           https://crates.io/
 %{!?with_bootstrap:BuildRequires:      %{name} >= 0.13.0}
 BuildRequires: cmake
@@ -40,10 +41,14 @@ BuildRequires:      openssl-devel
 BuildRequires: pkgconfig
 BuildRequires: zlib-devel
 Requires:      rust
-ExclusiveArch: %{x8664} %{ix86}
+ExclusiveArch: %{x8664} %{ix86} x32
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%ifarch x32
+%define                rust_triple     x86_64-unknown-linux-gnux32
+%else
 %define                rust_triple     %{_target_cpu}-unknown-linux-gnu
+%endif
 
 %if %{with bootstrap}
 %define                bootstrap_root  cargo-%{cargo_bootstrap}-%{rust_triple}
@@ -92,6 +97,10 @@ Dopełnianie parametrów polecenia cargo w powłoce Zsh.
 
 %prep
 %setup -q -n %{name}-%{cargo_version} -a4
+%ifarch x32
+%patch0 -p1
+%endif
+
 %if %{with bootstrap}
 %ifarch %{x8664}
 tar xf %{SOURCE2}

diff --git a/x32.patch b/x32.patch
new file mode 100644 (file)
index 0000000..45367d4
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,17 @@
+--- cargo-0.25.0/vendor/filetime/src/unix/mod.rs~      2018-02-20 19:53:15.000000000 +0100
++++ cargo-0.25.0/vendor/filetime/src/unix/mod.rs       2018-04-02 01:19:49.093609820 +0200
+@@ -72,7 +72,7 @@
+     fn to_timespec(ft: &FileTime) -> timespec {
+         timespec {
+             tv_sec: ft.seconds() as time_t,
+-            tv_nsec: ft.nanoseconds() as c_long,
++            tv_nsec: ft.nanoseconds() as libc::c_longlong,
+         }
+     }
+ }
+--- cargo-0.25.0/vendor/filetime/.cargo-checksum.json~ 2018-02-20 19:53:15.000000000 +0100
++++ cargo-0.25.0/vendor/filetime/.cargo-checksum.json  2018-04-02 01:22:07.455974081 +0200
+@@ -1 +1 @@
+-{"files":{".travis.yml":"de7306a8b64f9142510c9f88ba330802a27e8634605a06e6472a9611f2ee275c","Cargo.toml":"22015d1ad71b5e0123dbe5a7b1612ccd3231e6419288dca72e9f1f4f48abdfa1","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"08815ef259032db08a0422b5c1a61439f0fd8cef4ad98ed50831164d4f1202f3","appveyor.yml":"3a74394c3e3ef3b2c7d9458f526e47587977e98d026b63f00be29479075ff597","src/lib.rs":"4b6eec606254f2d0705d619feb265022be8d57ae87d97fd8c071a5d90c370982","src/redox.rs":"7b6376069ea06e6593058699af40fa780c3d621c010d31bfa6c1bfae18de28f4","src/unix/linux.rs":"6529e0e2f3927752ea70f935eee1e49f7e70faf3d6c0df4851b2edb07687b531","src/unix/mod.rs":"1c0be9690beb28d4642edcd01e2e597afde9f2adcc74b24b93a143b1b8ad2257","src/unix/utimensat.rs":"f5a0c83b43b2cc694e20f2375e87e26c10d726438c0e05e21751ddbd74dc8f6e","src/unix/utimes.rs":"9880b06f14a22ec5877bb6d78e1309ce89db2a0a43649f2a88207c9bb8708f36","src/windows.rs":"37dd08863698a5c32c103374ad1ed776405b75038c88bc48b7db28ad9c5bf86b"},"package":"714653f3e34871534de23771ac7b26e999651a0a228f47beb324dfdf1dd4b10f"}
+\ No newline at end of file
++{"files":{".travis.yml":"de7306a8b64f9142510c9f88ba330802a27e8634605a06e6472a9611f2ee275c","Cargo.toml":"22015d1ad71b5e0123dbe5a7b1612ccd3231e6419288dca72e9f1f4f48abdfa1","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"08815ef259032db08a0422b5c1a61439f0fd8cef4ad98ed50831164d4f1202f3","appveyor.yml":"3a74394c3e3ef3b2c7d9458f526e47587977e98d026b63f00be29479075ff597","src/lib.rs":"4b6eec606254f2d0705d619feb265022be8d57ae87d97fd8c071a5d90c370982","src/redox.rs":"7b6376069ea06e6593058699af40fa780c3d621c010d31bfa6c1bfae18de28f4","src/unix/linux.rs":"6529e0e2f3927752ea70f935eee1e49f7e70faf3d6c0df4851b2edb07687b531","src/unix/mod.rs":"8e616e4526922ee444321db1584644b4533699b17989c7e4fd484dde25e56f0c","src/unix/utimensat.rs":"f5a0c83b43b2cc694e20f2375e87e26c10d726438c0e05e21751ddbd74dc8f6e","src/unix/utimes.rs":"9880b06f14a22ec5877bb6d78e1309ce89db2a0a43649f2a88207c9bb8708f36","src/windows.rs":"37dd08863698a5c32c103374ad1ed776405b75038c88bc48b7db28ad9c5bf86b"},"package":"714653f3e34871534de23771ac7b26e999651a0a228f47beb324dfdf1dd4b10f"}