[packages/libffado] - require scons 4 to ensure configuring with python3, adjusted detect-x32 patch
qboosh
qboosh at pld-linux.org
Thu Jul 14 21:20:15 CEST 2022
commit 5a7fec9d48b7fd5b4a27f6028fb9306818d08748
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Jul 14 21:22:03 2022 +0200
- require scons 4 to ensure configuring with python3, adjusted detect-x32 patch
detect-x32.patch | 2 +-
libffado.spec | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/libffado.spec b/libffado.spec
index 8f54d01..ef3e691 100644
--- a/libffado.spec
+++ b/libffado.spec
@@ -36,7 +36,7 @@ BuildRequires: libxml++-devel >= 3.0.0
BuildRequires: pkgconfig
BuildRequires: rpm-build >= 4.6
BuildRequires: rpmbuild(macros) >= 1.752
-BuildRequires: scons
+BuildRequires: scons >= 4
%if %{with apidocs}
BuildRequires: texlive-fonts-rsfs
BuildRequires: texlive-format-pdflatex
diff --git a/detect-x32.patch b/detect-x32.patch
index f53ef3c..c1a797f 100644
--- a/detect-x32.patch
+++ b/detect-x32.patch
@@ -44,7 +44,7 @@ Author: Adam Borowski <kilobyte at angband.pl>
+ cc = os.getenv('CC')
+ if cc == None:
+ cc = 'cc'
-+ x = check_output((cc, '-dumpmachine'))
++ x = check_output((cc, '-dumpmachine')).detect()
+ for line in x.split('\n'):
+ if line.endswith('x32'):
+ return True
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libffado.git/commitdiff/5a7fec9d48b7fd5b4a27f6028fb9306818d08748
More information about the pld-cvs-commit
mailing list