From dc366c58f2f63cc5aa4955f60ba2c337203c05d0 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@klomp.org>
Date: Wed, 17 Aug 2022 14:58:40 +0200
Subject: [PATCH] Add gcc_full_build_factory_gen function

Call it with extra_configure_arg="--with-float=hard" for the
gcc_full_ubuntu_armhf_builder.
---
 builder/master.cfg | 62 +++++++++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/builder/master.cfg b/builder/master.cfg
index f945b14..dc51fd0 100644
--- a/builder/master.cfg
+++ b/builder/master.cfg
@@ -2987,31 +2987,36 @@ gcc_debian_amd64_builder = util.BuilderConfig(
         factory=gcc_build_factory)
 c['builders'].append(gcc_debian_amd64_builder)
 
-gcc_full_build_factory = util.BuildFactory()
-gcc_full_build_factory.addStep(gcc_build_git_step)
-gcc_full_build_factory.addStep(gcc_rm_build_step)
-gcc_full_build_configure_step = steps.Configure(
-        workdir='gcc-build',
-        command=['../gcc/configure',],
-        name='configure',
-        haltOnFailure=True)
-gcc_full_build_factory.addStep(gcc_full_build_configure_step)
-gcc_full_build_factory.addStep(steps.Compile(
-        workdir='gcc-build',
-        command=['make', util.Interpolate('-j%(prop:maxcpus)s')],
-        name='make',
-        haltOnFailure=True))
-# We want parallelism to get through this as quickly as possible.
-# Even if that means bunsen gets some parallel/duplicate log files
-gcc_full_build_factory.addStep(steps.Test(
-        workdir='gcc-build',
-        command=['make', 'check', util.Interpolate('-j%(prop:maxcpus)s')],
-        name='make check',
-        haltOnFailure=False, flunkOnFailure=True))
-gcc_full_build_factory.addSteps(bunsen_logfile_upload_cpio_steps(
-        ["*.log", "*.sum"],
-        workdir='gcc-build'))
-gcc_full_build_factory.addStep(gcc_rm_build_step)
+def gcc_full_build_factory_gen(extra_configure_arg=None):
+        gcc_full_build_factory = util.BuildFactory()
+        gcc_full_build_factory.addStep(gcc_build_git_step)
+        gcc_full_build_factory.addStep(gcc_rm_build_step)
+        configure_command = ['../gcc/configure']
+        if extra_configure_arg:
+                configure_command.append(extra_configure_arg)
+        gcc_full_build_configure_step = steps.Configure(
+                workdir='gcc-build',
+                command=configure_command,
+                name='configure',
+                haltOnFailure=True)
+        gcc_full_build_factory.addStep(gcc_full_build_configure_step)
+        gcc_full_build_factory.addStep(steps.Compile(
+                workdir='gcc-build',
+                command=['make', util.Interpolate('-j%(prop:maxcpus)s')],
+                name='make',
+                haltOnFailure=True))
+        # We want parallelism to get through this as quickly as possible.
+        # Even if that means bunsen gets some parallel/duplicate log files
+        gcc_full_build_factory.addStep(steps.Test(
+                workdir='gcc-build',
+                command=['make', 'check', util.Interpolate('-j%(prop:maxcpus)s')],
+                name='make check',
+                haltOnFailure=False, flunkOnFailure=True))
+        gcc_full_build_factory.addSteps(bunsen_logfile_upload_cpio_steps(
+                ["*.log", "*.sum"],
+                workdir='gcc-build'))
+        gcc_full_build_factory.addStep(gcc_rm_build_step)
+        return gcc_full_build_factory
 
 gcc_full_debian_amd64_builder = util.BuilderConfig(
         name="gcc-full-debian-amd64",
@@ -3020,7 +3025,7 @@ gcc_full_debian_amd64_builder = util.BuilderConfig(
                     readContainerFile('debian-stable')},
         workernames=big_vm_workers,
         tags=["gcc-full", "debian", "x86_64"],
-        factory=gcc_full_build_factory)
+        factory=gcc_full_build_factory_gen())
 c['builders'].append(gcc_full_debian_amd64_builder)
 
 gcc_full_ubuntu_armhf_builder = util.BuilderConfig(
@@ -3028,7 +3033,8 @@ gcc_full_ubuntu_armhf_builder = util.BuilderConfig(
         collapseRequests=True,
         workernames=["ubuntu22_04-armhf"],
         tags=["gcc-full", "ubuntu", "armhf"],
-        factory=gcc_full_build_factory)
+        factory=gcc_full_build_factory_gen(
+                extra_configure_arg="--with-float=hard"))
 c['builders'].append(gcc_full_ubuntu_armhf_builder)
 
 gcc_full_ubuntu_arm64_builder = util.BuilderConfig(
@@ -3036,7 +3042,7 @@ gcc_full_ubuntu_arm64_builder = util.BuilderConfig(
         collapseRequests=True,
         workernames=["ubuntu22_04-arm64"],
         tags=["gcc-full", "ubuntu", "arm64"],
-        factory=gcc_full_build_factory)
+        factory=gcc_full_build_factory_gen())
 c['builders'].append(gcc_full_ubuntu_arm64_builder)
 
 
-- 
2.30.2