Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use gcc-toolset-14. #259

Merged
merged 1 commit into from
Jan 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/almalinux-8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion build/almalinux-8/Dockerfile.test.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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@@
2 changes: 1 addition & 1 deletion build/almalinux-8/include/install-build-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions build/almalinux-8/rpmbuild/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/almalinux-9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion build/almalinux-9/Dockerfile.test.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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@@
2 changes: 1 addition & 1 deletion build/almalinux-9/include/install-build-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev/almalinux-8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion dev/almalinux-9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down