Merge pull request #259 from vespa-engine/toregge/use-gcc-toolset-14

Use gcc-toolset-14.
vespa-engine · Jan 21, 2025 · d91fcf6 · d91fcf6
2 parents d042845 + 12f4732
commit d91fcf6
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -424,7 +424,7 @@ into the container again with the appropriate level of verbosity, e.g.
     *   Build, Execution, Deployment | Toolchains
         *   CMake: /usr/bin/cmake
         *   Build Tools: /usr/bin/make
-        *   Debugger: /opt/rh/gcc-toolset-13/root/usr/bin/gdb
+        *   Debugger: /opt/rh/gcc-toolset-14/root/usr/bin/gdb
     *   Advanced Settings (Host)
         *   Automatically import CMake Presets: None
 *   File | New project setup | Settings for new projects
@@ -447,7 +447,7 @@ into the container again with the appropriate level of verbosity, e.g.
     *   Build, Execution, Deployment | Toolchains
         *   CMake: /usr/bin/cmake
         *   Build Tools: /usr/bin/make
-        *   Debugger: /opt/rh/gcc-toolset-13/root/usr/bin/gdb
+        *   Debugger: /opt/rh/gcc-toolset-14/root/usr/bin/gdb
     *   Advanced Settings (Host)
         *   Automatically import CMake Presets: None
 *   File | New project setup | Settings for new projects

diff --git a/build/almalinux-8/Dockerfile b/build/almalinux-8/Dockerfile
@@ -7,6 +7,6 @@ ENV LANG=C.UTF-8 container=docker
 
 # Change git reference for a specific version of the vespa.spec file.
 # Use a tag or SHA to allow for reproducible builds.
-ENV VESPA_SRC_REF="b0402dc7d475bc65ac85d5d989b915f28d343ab8"
+ENV VESPA_SRC_REF="69299e1ca432e9dec6711dcc0fe7af60b8c58f5b"
 
 RUN --mount=type=bind,target=/include/,source=include/,rw /bin/sh /include/install-build-dependencies.sh
diff --git a/build/almalinux-8/Dockerfile.test.tmpl b/build/almalinux-8/Dockerfile.test.tmpl
@@ -7,6 +7,6 @@ ENV LANG=C.UTF-8 container=docker
 
 # Change git reference for a specific version of the vespa.spec file.
 # Use a tag or SHA to allow for reproducible builds.
-ENV VESPA_SRC_REF="b0402dc7d475bc65ac85d5d989b915f28d343ab8"
+ENV VESPA_SRC_REF="69299e1ca432e9dec6711dcc0fe7af60b8c58f5b"
 
 RUN @@MOUNTS_CMD@@ /bin/sh /include/install-build-dependencies.sh @@VESPADEV_RPM_SOURCE@@
diff --git a/build/almalinux-8/include/install-build-dependencies.sh b/build/almalinux-8/include/install-build-dependencies.sh
@@ -59,7 +59,7 @@ fi
 GIT_REPO="https://github.com/vespa-engine/vespa"
 
 # Change git reference for a specific version of the vespa.spec file. Use a tag or SHA to allow for reproducible builds.
-VESPA_SRC_REF="b0402dc7d475bc65ac85d5d989b915f28d343ab8"
+VESPA_SRC_REF="69299e1ca432e9dec6711dcc0fe7af60b8c58f5b"
 
 # Fetch the RPM spec for vespa
 curl -Lf -O $GIT_REPO/raw/$VESPA_SRC_REF/dist/vespa.spec

diff --git a/build/almalinux-8/rpmbuild/README.md b/build/almalinux-8/rpmbuild/README.md
@@ -74,6 +74,7 @@ Build all packages needed for building test docker image for vespa development o
     cd $HOME/git/docker-image-dev/build/almalinux-8/rpmbuild
     ./build-rpm.sh -a toolset-12
     ./build-rpm.sh -a toolset-13
+    ./build-rpm.sh -a toolset-14
     ./build-rpm.sh -a lz4
     ./build-rpm.sh -a zstd
     ./build-rpm.sh -a openssl

diff --git a/build/almalinux-9/Dockerfile b/build/almalinux-9/Dockerfile
@@ -7,6 +7,6 @@ ENV LANG=C.UTF-8 container=docker
 
 # Change git reference for a specific version of the vespa.spec file.
 # Use a tag or SHA to allow for reproducible builds.
-ENV VESPA_SRC_REF="b0402dc7d475bc65ac85d5d989b915f28d343ab8"
+ENV VESPA_SRC_REF="69299e1ca432e9dec6711dcc0fe7af60b8c58f5b"
 
 RUN --mount=type=bind,target=/include/,source=include/,rw /bin/sh /include/install-build-dependencies.sh
diff --git a/build/almalinux-9/Dockerfile.test.tmpl b/build/almalinux-9/Dockerfile.test.tmpl
@@ -7,6 +7,6 @@ ENV LANG=C.UTF-8 container=docker
 
 # Change git reference for a specific version of the vespa.spec file.
 # Use a tag or SHA to allow for reproducible builds.
-ENV VESPA_SRC_REF="b0402dc7d475bc65ac85d5d989b915f28d343ab8"
+ENV VESPA_SRC_REF="69299e1ca432e9dec6711dcc0fe7af60b8c58f5b"
 
 RUN @@MOUNTS_CMD@@ /bin/sh /include/install-build-dependencies.sh @@VESPADEV_RPM_SOURCE@@
diff --git a/build/almalinux-9/include/install-build-dependencies.sh b/build/almalinux-9/include/install-build-dependencies.sh
@@ -45,7 +45,7 @@ dnf -y install \
 GIT_REPO="https://github.com/vespa-engine/vespa"
 
 # Change git reference for a specific version of the vespa.spec file. Use a tag or SHA to allow for reproducible builds.
-VESPA_SRC_REF="b0402dc7d475bc65ac85d5d989b915f28d343ab8"
+VESPA_SRC_REF="69299e1ca432e9dec6711dcc0fe7af60b8c58f5b"
 
 # Fetch the RPM spec for vespa
 curl -Lf -O $GIT_REPO/raw/$VESPA_SRC_REF/dist/vespa.spec

diff --git a/dev/almalinux-8/Dockerfile b/dev/almalinux-8/Dockerfile
@@ -12,7 +12,7 @@ RUN dnf -y install \
         vim \
         wget \
         emacs \
-        gcc-toolset-13-gdb \
+        gcc-toolset-14-gdb \
         man-db \
         man-pages \
         hunspell-en \

diff --git a/dev/almalinux-9/Dockerfile b/dev/almalinux-9/Dockerfile
@@ -12,7 +12,7 @@ RUN dnf -y install \
         vim \
         wget \
         emacs \
-        gcc-toolset-13-gdb \
+        gcc-toolset-14-gdb \
         man-db \
         man-pages \
         hunspell-en \