From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 18 Jul 2025 16:20:55 +0000 (-0400)
Subject: scripts/build_utils: setup_pbuilder_for_old_gcc() installs requested version
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2405%2Fhead;p=ceph-build.git

scripts/build_utils: setup_pbuilder_for_old_gcc() installs requested version

ubuntu noble is special in that we gcc-14 is available but gcc-13 is the
default. before using update-alternatives to prefer gcc-14, we need to
make sure it's installed

copy the relevant bit from setup_pbuilder_for_new_gcc()'s hook
D05install-new-gcc to make sure the requested version is installed
before running the D10update-gcc-alternatives hook

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index 2179f2999..598b1bf30 100755
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -806,6 +806,13 @@ setup_pbuilder_for_old_gcc() {
         noble)
             old=14;;
     esac
+
+    # make sure the requested version is installed. this isn't the case by default on noble
+    cat > $hookdir/D05install-old-gcc <<EOF
+env DEBIAN_FRONTEND=noninteractive apt-get install -y g++-$old
+EOF
+    chmod +x $hookdir/D05install-old-gcc
+
     setup_gcc_hook $old > $hookdir/D10update-gcc-alternatives
     chmod +x $hookdir/D10update-gcc-alternatives
 }