[packages/python3-adblock] fix install on x32

atler atler at pld-linux.org
Wed Apr 14 18:18:50 CEST 2021


commit 2a8ce8c0231ed00b15619d4067b745cf64c351b7
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Apr 14 18:16:02 2021 +0200

    fix install on x32

 python3-adblock.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/python3-adblock.spec b/python3-adblock.spec
index 91148db..70186fb 100644
--- a/python3-adblock.spec
+++ b/python3-adblock.spec
@@ -22,6 +22,12 @@ BuildRequires:	rust >= 1.45
 ExclusiveArch:	%{rust_arches}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%ifarch x32
+%define		cargo_outdir	target/x86_64-unknown-linux-gnux32
+%else
+%define		cargo_outdir	target
+%endif
+
 %description
 Python wrapper for Brave's adblocking library, which is written in
 Rust.
@@ -59,7 +65,7 @@ RUSTFLAGS="%{rpmrustflags}" \
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{py3_sitedir}
-cp -p target/release/libadblock.so $RPM_BUILD_ROOT%{py3_sitedir}/%{module}.so
+cp -p %{cargo_outdir}/release/libadblock.so $RPM_BUILD_ROOT%{py3_sitedir}/%{module}.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python3-adblock.git/commitdiff/2a8ce8c0231ed00b15619d4067b745cf64c351b7



More information about the pld-cvs-commit mailing list