The package rpms/python-graph-tool.git has added or updated architecture specific content
in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/python-graph-tool.git/commit/?id=....
Change:
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit 3bb388dac148131146ac12fc7a4d27c9040e1f7f
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Wed Dec 21 17:31:26 2022 -0500
Simplify constraining the build
diff --git a/python-graph-tool.spec b/python-graph-tool.spec
index e36a357..9e829a4 100644
--- a/python-graph-tool.spec
+++ b/python-graph-tool.spec
@@ -1,26 +1,5 @@
-# Koji has two types of builders:
-# 16Gb + 6 cores
-# 128Gb + 48 cores
-# There's no way to choose either, so we rely on luck
-#
-# This needs about 15 gigs per thread, otherwise OOMs. So, we calculate the number of
threads we can afford to use for make:
-# meminfo gives output in kB (1000 bytes)
-%global numthreads %(awk '/MemTotal:/ {print int($2/15e6)}' /proc/meminfo)
-# But make sure it is > 0
-%if 0%{numthreads} == 0
-%global numthreads 1
-%endif
-
-# If _smp_build_ncpus is not defined (on older rpms)
-# assume there's only one
-%if 0%{?_smp_build_ncpus} == 0
-%global _smp_build_ncpus 1
-%endif
-
-# Use the smaller number of threads
-%if 0%{numthreads} > 0%{?_smp_build_ncpus}
-%global numthreads %{?_smp_build_ncpus}
-%endif
+# This needs about 15 gigs per thread, otherwise OOMs.
+%constrain_build -m 15360
%global _description %{expand:
Graph-tool is an efficient Python module for manipulation and statistical
@@ -170,9 +149,7 @@ echo 'intersphinx_mapping.clear()' >> doc/conf.py
--with-python-module-path=%{python3_sitearch} \
--with-boost-libdir=%{_libdir} \
--enable-debug
-echo "Building with %{numthreads} of %{?_smp_build_ncpus} available CPUs"
-# Uses the latest value set by -j
-%make_build -j%{numthreads}
+%make_build
%install
commit c2626fb5810f6b364b08181bae60d9b88be23638
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Tue Dec 20 18:08:44 2022 -0500
No longer need to exclude armv7hl on F37+
- Additionally, we no longer need to justify excluding i686
diff --git a/python-graph-tool.spec b/python-graph-tool.spec
index cd637db..e36a357 100644
--- a/python-graph-tool.spec
+++ b/python-graph-tool.spec
@@ -79,37 +79,8 @@ Source0:
https://downloads.skewed.de/graph-tool/graph-tool-%{version}.tar
# fail to respect the distribution defaults.
Patch: 0001-Remove-upstream-compiler-flags.patch
-# Fails on i686, armv7hl
-# ../../../src/pcg-cpp/include/pcg_random.hpp:1247:40: error: call to
-# non-'constexpr' function 'pcg_extras::uint_x4<U, V>
-# pcg_extras::operator-(const pcg_extras::uint_x4<U, V>&, const
-# pcg_extras::uint_x4<U, V>&) [with UInt = unsigned int; UIntX2 = long
-# long unsigned int]'
-# 1247 | (state_type(1U) << table_pow2) - state_type(1U);
-# | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~
-# In file included from ../../../src/pcg-cpp/include/pcg_extras.hpp:84,
-# from ../../../src/pcg-cpp/include/pcg_random.hpp:114,
-# from ../../../src/graph/random.hh:21,
-# from graph_motifs.hh:26,
-# from graph_motifs.cc:24:
-# ../../../src/pcg-cpp/include/pcg_uint128.hpp:642:22: note:
-# 'pcg_extras::uint_x4<U, V> pcg_extras::operator-(const
-# pcg_extras::uint_x4<U, V>&, const pcg_extras::uint_x4<U, V>&)
[with
-# UInt = unsigned int; UIntX2 = long long unsigned int]' declared here
-# 642 | uint_x4<UInt,UIntX2> operator-(const uint_x4<UInt,UIntX2>&
a,
-# | ^~~~~~~~
-# issue filed:
https://git.skewed.de/count0/graph-tool/issues/617
-#
https://bugzilla.redhat.com/show_bug.cgi?id=1771023
-#
https://bugzilla.redhat.com/show_bug.cgi?id=1771024
-#
-# Beginning with F37, armv7hl is not a supported primary architecture and
-# EncourageI686LeafRemoval is approved, so we do not need to justify excluding
-# these architectures.
-#
-# Takes ~23 hours on x86_64 if we get unlucky and get a 6 core 16gig machine,
-# ~4 hours if we get a 48 core 128gig machine
-# Takes ~45 hours on aarch64
-ExcludeArch: %{ix86} armv7hl
+#
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch: %{ix86}
BuildRequires: make
BuildRequires: git-core
commit b83af9e7d826e77e5f4edbb569ea2921fa1d82d9
Author: Benjamin A. Beasley <code(a)musicinmybrain.net>
Date: Thu Nov 24 07:33:27 2022 -0500
Drop -fpermissive workaround
It is no longer needed (fixed in mpfr-4.1.1-p1).
diff --git a/python-graph-tool.spec b/python-graph-tool.spec
index c1c4e9b..cd637db 100644
--- a/python-graph-tool.spec
+++ b/python-graph-tool.spec
@@ -194,14 +194,6 @@ echo 'intersphinx_mapping.clear()' >> doc/conf.py
%build
-%if 0%{?fc38}
-# Workaround for CGAL/mpfr issue:
-# Apparent incompatibility with mpfr 4.1.1 (compiler error)
-#
https://bugzilla.redhat.com/show_bug.cgi?id=2144197
-%set_build_flags
-export CPPFLAGS="${CPPFLAGS} -fpermissive"
-%endif
-
./autogen.sh
%configure \
--with-python-module-path=%{python3_sitearch} \