Skip to content

Commit 0d5f68e

Browse files
authored
Add some extra configure options on Fedora/RHEL (#732)
* Enable --with-valgrind on all cstratak buildbots. * Add --with-system-expat to Fedora and CentOS Stream 10 buildbots. * Enable --with-system-libmpdec on all cstratak buildbots.
1 parent dc479e3 commit 0d5f68e

1 file changed

Lines changed: 6 additions & 8 deletions

File tree

master/custom/factories.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -428,17 +428,14 @@ class RHEL8Build(UnixBuild):
428428
"--enable-shared",
429429
"--with-computed-gotos=yes",
430430
"--with-dbmliborder=gdbm:ndbm:bdb",
431-
# FIXME: enable these flags
432-
# "--with-system-expat",
433-
# "--with-system-ffi",
434431
"--enable-loadable-sqlite-extensions",
435432
"--with-ssl-default-suites=openssl",
436433
"--without-static-libpython",
437434
"--with-lto",
438435
# Not all workers have dtrace installed
439436
# "--with-dtrace",
440-
# Not all workers have Valgrind headers installed
441-
# "--with-valgrind",
437+
"--with-valgrind",
438+
"--with-system-libmpdec",
442439
]
443440

444441
# Building Python out of tree: similar to what the specfile does, but
@@ -460,7 +457,9 @@ class CentOS9Build(RHEL8Build):
460457

461458
class CentOS10Build(CentOS9Build):
462459
# Build on 64-bit CentOS Stream 10.
463-
pass
460+
configureFlags = CentOS9Build.configureFlags + [
461+
"--with-system-expat",
462+
]
464463

465464

466465
class FedoraStableBuild(RHEL8Build):
@@ -471,8 +470,7 @@ class FedoraStableBuild(RHEL8Build):
471470
# https://src.fedoraproject.org/rpms/python3.11/blob/rawhide/f/python3.11.spec
472471
configureFlags = RHEL8Build.configureFlags + [
473472
# Options specific to Fedora
474-
# FIXME: enable this flag
475-
# "--with-system-libmpdec",
473+
"--with-system-expat",
476474
# Don't make a buildbot fail when pip/setuptools is updated in Python,
477475
# whereas the buildbot uses older versions.
478476
# "--with-wheel-pkg-dir=/usr/share/python-wheels/",

0 commit comments

Comments
 (0)