diff options
7 files changed, 17 insertions, 17 deletions
diff --git a/client/go/script-utils/startcbinary/common_env.go b/client/go/script-utils/startcbinary/common_env.go index eadb0aafb1b..eee7500f5d2 100644 --- a/client/go/script-utils/startcbinary/common_env.go +++ b/client/go/script-utils/startcbinary/common_env.go @@ -70,7 +70,7 @@ func (spec *ProgSpec) configureUseMadvise() { func (spec *ProgSpec) configurePath() { // Prefer newer gdb and pstack: - spec.prependPath("/opt/rh/gcc-toolset-11/root/usr/bin") + spec.prependPath("/opt/rh/gcc-toolset-12/root/usr/bin") // Maven is needed for tester applications: spec.prependPath(vespa.FindHome() + "/local/maven/bin") spec.prependPath(vespa.FindHome() + "/bin64") diff --git a/client/go/vespa/load_env.go b/client/go/vespa/load_env.go index 5c216c12c31..3c73f7aaf53 100644 --- a/client/go/vespa/load_env.go +++ b/client/go/vespa/load_env.go @@ -17,7 +17,7 @@ import ( ) const ( - CURRENT_GCC_TOOLSET = "/opt/rh/gcc-toolset-11/root/usr/bin" + CURRENT_GCC_TOOLSET = "/opt/rh/gcc-toolset-12/root/usr/bin" ) // backwards-compatible parsing of default-env.txt @@ -290,7 +290,7 @@ func ensureGoodPath(receiver loadEnvReceiver) { builder.appendPath(FindHome() + "/bin") builder.appendPath(FindHome() + "/bin64") // Prefer newer gdb and pstack: - builder.appendPath("/opt/rh/gcc-toolset-11/root/usr/bin") + builder.appendPath("/opt/rh/gcc-toolset-12/root/usr/bin") // how to find the "java" program? if javaHome := os.Getenv(envvars.JAVA_HOME); javaHome != "" { builder.appendPath(javaHome + "/bin") diff --git a/dist/vespa.spec b/dist/vespa.spec index 2f45cf0ffa1..4c9d7c5df72 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -48,17 +48,17 @@ BuildRequires: epel-release %if 0%{?el8} %global _centos_stream %(grep -qs '^NAME="CentOS Stream"' /etc/os-release && echo 1 || echo 0) %if 0%{?_centos_stream} -BuildRequires: gcc-toolset-11-gcc-c++ -BuildRequires: gcc-toolset-11-binutils -BuildRequires: gcc-toolset-11-libasan-devel -BuildRequires: gcc-toolset-11-libatomic-devel -%define _devtoolset_enable /opt/rh/gcc-toolset-11/enable +BuildRequires: gcc-toolset-12-gcc-c++ +BuildRequires: gcc-toolset-12-binutils +BuildRequires: gcc-toolset-12-libasan-devel +BuildRequires: gcc-toolset-12-libatomic-devel +%define _devtoolset_enable /opt/rh/gcc-toolset-12/enable %else -BuildRequires: gcc-toolset-11-gcc-c++ -BuildRequires: gcc-toolset-11-binutils -BuildRequires: gcc-toolset-11-libasan-devel -BuildRequires: gcc-toolset-11-libatomic-devel -%define _devtoolset_enable /opt/rh/gcc-toolset-11/enable +BuildRequires: gcc-toolset-12-gcc-c++ +BuildRequires: gcc-toolset-12-binutils +BuildRequires: gcc-toolset-12-libasan-devel +BuildRequires: gcc-toolset-12-libatomic-devel +%define _devtoolset_enable /opt/rh/gcc-toolset-12/enable %endif BuildRequires: maven BuildRequires: maven-openjdk17 diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollector.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollector.java index cfb2d240bfa..28773767d24 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollector.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollector.java @@ -28,7 +28,7 @@ public class CoreCollector { private static final Pattern CORE_GENERATOR_PATH_PATTERN = Pattern.compile("(?m)^Core was generated by `(?<path>.*?)'\\."); private static final Pattern EXECFN_PATH_PATTERN = Pattern.compile("^.* execfn: '(?<path>.*?)'"); private static final Pattern FROM_PATH_PATTERN = Pattern.compile("^.* from '(?<path>.*?)'"); - static final String GDB_PATH_RHEL8 = "/opt/rh/gcc-toolset-11/root/bin/gdb"; + static final String GDB_PATH_RHEL8 = "/opt/rh/gcc-toolset-12/root/bin/gdb"; private final ContainerOperations container; diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java index 8f251bf72c5..4fa18c71da0 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java @@ -95,7 +95,7 @@ public class CoreCollectorTest { fail("Expected not to be able to get bin path"); } catch (RuntimeException e) { assertEquals("Failed to extract binary path from GDB, result: exit status 1, output 'Error 123', command: " + - "[/opt/rh/gcc-toolset-11/root/bin/gdb, -n, -batch, -core, /tmp/core.1234]", e.getMessage()); + "[/opt/rh/gcc-toolset-12/root/bin/gdb, -n, -batch, -core, /tmp/core.1234]", e.getMessage()); } } diff --git a/screwdriver/build-vespa.sh b/screwdriver/build-vespa.sh index 1a9288c007f..a0e205d2597 100755 --- a/screwdriver/build-vespa.sh +++ b/screwdriver/build-vespa.sh @@ -6,7 +6,7 @@ set -e readonly SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd )" readonly NUM_THREADS=$(( $(nproc) + 2 )) -source /etc/profile.d/enable-gcc-toolset-11.sh +source /etc/profile.d/enable-gcc-toolset-12.sh export MALLOC_ARENA_MAX=1 export MAVEN_OPTS="-Xss1m -Xms128m -Xmx2g" diff --git a/vespabase/src/common-env.sh b/vespabase/src/common-env.sh index 702192a25ab..6b1faadfb1d 100755 --- a/vespabase/src/common-env.sh +++ b/vespabase/src/common-env.sh @@ -163,7 +163,7 @@ export MALLOC_ARENA_MAX=1 optionally_reduce_base_frequency # Prefer newer gdb and pstack -prepend_path /opt/rh/gcc-toolset-11/root/usr/bin +prepend_path /opt/rh/gcc-toolset-12/root/usr/bin # Maven is needed for tester applications prepend_path "$VESPA_HOME/local/maven/bin" |