From 83914698dfb77a85496e93e3faa5de9131347cb8 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@klomp.org>
Date: Fri, 15 Dec 2023 01:43:27 +0100
Subject: [PATCH] Add regenerate-opt-urls to gcc-autoregen

Add gcc build dependencies and ccacheto Containerfile-autotools.
Add regenerate_opt_urls steps to gcc_autoregen_factory.
---
 builder/containers/Containerfile-autotools |  2 ++
 builder/master.cfg                         | 34 ++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/builder/containers/Containerfile-autotools b/builder/containers/Containerfile-autotools
index 1099986..8cc8a22 100644
--- a/builder/containers/Containerfile-autotools
+++ b/builder/containers/Containerfile-autotools
@@ -7,6 +7,8 @@ RUN apt-get update && \
     apt-get upgrade -y && \
     apt-get install -y \
       build-essential libtool perl python3-minimal bash \
+      libmpc-dev libgmp-dev libmpfr-dev gdc texinfo flex \
+      ccache \
       make git \
       gettext \
       m4 pkg-config \
diff --git a/builder/master.cfg b/builder/master.cfg
index 04c54da..0e5ce62 100644
--- a/builder/master.cfg
+++ b/builder/master.cfg
@@ -1200,6 +1200,35 @@ git_diff_step = steps.ShellCommand(
         name="git diff",
         haltOnFailure=True)
 
+# Note that the name of the default workdir is 'build'
+# 'build' is the name of the source checkout (yes, confusing).
+# So this creates 'build/objdir'.
+gcc_build_mkdir_step = steps.ShellCommand(
+        command=['mkdir', '-p', 'objdir'],
+        name='mkdir objdir',
+        haltOnFailure=True)
+
+gcc_configure_opt_urls_step = steps.Configure(
+        workdir='build/objdir',
+        command=["../configure",
+                 "--disable-multilib",
+                 "--disable-bootstrap",
+                 "--enable-languages=c,d,fortran"],
+        name="configure",
+        haltOnFailure=True)
+
+gcc_make_html_step = steps.Compile(
+        workdir='build/objdir',
+        command=['make', util.Interpolate('-j%(prop:ncpus)s'), 'html'],
+        name='make html',
+        haltOnFailure=True)
+
+gcc_make_regenerate_opt_urls_step = steps.Compile(
+        workdir='build/objdir/gcc',
+        command=['make', 'regenerate-opt-urls'],
+        name='make regenerate-opt-urls',
+        haltOnFailure=True)
+
 # Generic make clean step to be run at the end of a build
 make_clean_step = steps.ShellCommand(
         command=["make", "clean"],
@@ -3454,6 +3483,11 @@ gcc_autoregen_factory = util.BuildFactory()
 gcc_autoregen_factory.addStep(gcc_git_step)
 gcc_autoregen_factory.addStep(autoregen_step)
 gcc_autoregen_factory.addStep(git_diff_step)
+gcc_autoregen_factory.addStep(gcc_build_mkdir_step)
+gcc_autoregen_factory.addStep(gcc_configure_opt_urls_step)
+gcc_autoregen_factory.addStep(gcc_make_html_step)
+gcc_autoregen_factory.addStep(gcc_make_regenerate_opt_urls_step)
+gcc_autoregen_factory.addStep(git_diff_step)
 
 gcc_autoregen_builder = util.BuilderConfig(
         name="gcc-autoregen",
-- 
2.39.3