[packages/dssim2/rust-macros] attempt at adding support for x32 target in nasm compiled sources
atler
atler at pld-linux.org
Mon Jan 24 12:02:39 CET 2022
commit 2726e750f3d652cc4582abf5775a3d89012109ab
Author: Jan Palus <atler at pld-linux.org>
Date: Mon Jan 24 11:59:41 2022 +0100
attempt at adding support for x32 target in nasm compiled sources
dssim2.spec | 2 ++
nasm-rs-x32.patch | 24 ++++++++++++++++++++++++
2 files changed, 26 insertions(+)
---
diff --git a/dssim2.spec b/dssim2.spec
index 5fa0496..edc057a 100644
--- a/dssim2.spec
+++ b/dssim2.spec
@@ -14,6 +14,7 @@ Source0: https://github.com/pornel/dssim/archive/%{version}/dssim-%{version}.tar
# tar cJf dssim-vendor-%{version}.tar.xz dssim-%{version}/{vendor,Cargo.lock}
Source1: dssim-vendor-%{version}.tar.xz
# Source1-md5: 09823b55783fe6efa146550ba92030a5
+Patch0: nasm-rs-x32.patch
URL: https://kornel.ski/dssim
BuildRequires: cargo
%ifarch %{ix86} %{x8664} x32
@@ -40,6 +41,7 @@ rozdzielczościami.
%prep
%setup -q -n dssim-%{version} -b1
+%patch0 -p1
# use our offline registry
export CARGO_HOME="$(pwd)/.cargo"
diff --git a/nasm-rs-x32.patch b/nasm-rs-x32.patch
new file mode 100644
index 0000000..45be53e
--- /dev/null
+++ b/nasm-rs-x32.patch
@@ -0,0 +1,24 @@
+--- dssim-3.0.2/vendor/nasm-rs/src/lib.rs.orig 2021-12-28 19:48:17.000000000 +0100
++++ dssim-3.0.2/vendor/nasm-rs/src/lib.rs 2022-01-24 11:37:55.316183333 +0100
+@@ -38,7 +38,13 @@
+ }
+
+ match parts[0] {
+- "x86_64" => x86_64_triple(parts[2]),
++ "x86_64" => {
++ if parts.len() == 4 && parts[3] == "gnux32" {
++ ("-felfx32", "-gdwarf")
++ } else {
++ x86_64_triple(parts[2])
++ }
++ },
+ "x86" | "i386" | "i586" | "i686" => x86_triple(parts[2]),
+ _ => ("", "-g"),
+ }
+--- dssim-3.0.2/vendor/nasm-rs/.cargo-checksum.json.orig 2021-12-28 19:48:17.000000000 +0100
++++ dssim-3.0.2/vendor/nasm-rs/.cargo-checksum.json 2022-01-24 11:48:41.842588064 +0100
+@@ -1 +1 @@
+-{"files":{"Cargo.toml":"53fc8cb5fa63d5c4187cacbeab0101393e3e794a197c0479542415cdd3e2126e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","README.markdown":"b895ae35bab26ae62fcc9db7023980479f31a36bb91ba2ca31ed723db2b32006","src/lib.rs":"f2841bd463deb38bd169d561a67813b83144fe81c91ce26ccf521e8f0ee7f24f"},"package":"a76f43faa0d13f9c89f72e1972446d558f003cfffb80eb16bb444231de1becd1"}
+\ No newline at end of file
++{"files":{"Cargo.toml":"53fc8cb5fa63d5c4187cacbeab0101393e3e794a197c0479542415cdd3e2126e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","README.markdown":"b895ae35bab26ae62fcc9db7023980479f31a36bb91ba2ca31ed723db2b32006","src/lib.rs":"ffb5aecf20ed537463e5db3f146885aee83528985c292d67a30953fb7263b9d7"},"package":"a76f43faa0d13f9c89f72e1972446d558f003cfffb80eb16bb444231de1becd1"}
+\ No newline at end of file
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dssim2.git/commitdiff/e2c9d3c775858e7541d3caffc00fb2a4263fc753
More information about the pld-cvs-commit
mailing list