From 2b25473f007b1eeedb2935d4c49bfb09d8e01746 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Fri, 24 Nov 2023 16:08:28 +0000 Subject: Avoid refering version of toolset everywhere. --- .../admin/vespa-wrapper/startcbinary/common_env.go | 2 +- client/go/internal/vespa/load_env.go | 4 +-- dist/patch.stl_vector.h.diff | 30 ---------------------- dist/vespa.spec | 21 +++------------ screwdriver/build-vespa.sh | 2 +- vespabase/src/common-env.sh | 2 +- 6 files changed, 8 insertions(+), 53 deletions(-) delete mode 100644 dist/patch.stl_vector.h.diff diff --git a/client/go/internal/admin/vespa-wrapper/startcbinary/common_env.go b/client/go/internal/admin/vespa-wrapper/startcbinary/common_env.go index 1a5d3ebab59..df204a1bc4b 100644 --- a/client/go/internal/admin/vespa-wrapper/startcbinary/common_env.go +++ b/client/go/internal/admin/vespa-wrapper/startcbinary/common_env.go @@ -45,7 +45,7 @@ func configureCommonEnv(spec *prog.Spec) { func configurePath(spec *prog.Spec) { // Prefer newer gdb and pstack: - prependPath("/opt/rh/gcc-toolset-12/root/usr/bin", spec) + prependPath("/opt/rh/gcc-toolset/root/usr/bin", spec) // Maven is needed for tester applications: prependPath(vespa.FindHome()+"/local/maven/bin", spec) prependPath(vespa.FindHome()+"/bin64", spec) diff --git a/client/go/internal/vespa/load_env.go b/client/go/internal/vespa/load_env.go index f98d09fb197..24e1b1cdefa 100644 --- a/client/go/internal/vespa/load_env.go +++ b/client/go/internal/vespa/load_env.go @@ -18,7 +18,7 @@ import ( ) const ( - CURRENT_GCC_TOOLSET = "/opt/rh/gcc-toolset-12/root/usr/bin" + CURRENT_GCC_TOOLSET = "/opt/rh/gcc-toolset/root/usr/bin" ) // backwards-compatible parsing of default-env.txt @@ -293,7 +293,7 @@ func ensureGoodPath(receiver loadEnvReceiver) { builder.appendPath(FindHome() + "/bin") builder.appendPath(FindHome() + "/bin64") // Prefer newer gdb and pstack: - builder.appendPath("/opt/rh/gcc-toolset-12/root/usr/bin") + builder.appendPath("/opt/rh/gcc-toolset/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/patch.stl_vector.h.diff b/dist/patch.stl_vector.h.diff deleted file mode 100644 index e2474c3a32b..00000000000 --- a/dist/patch.stl_vector.h.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- /opt/rh/gcc-toolset-12/root/usr/include/c++/12/bits/stl_vector.h 2022-09-14 17:00:12.000000000 +0000 -+++ ./stl_vector.h 2023-02-10 13:24:44.885703192 +0000 -@@ -1814,10 +1814,10 @@ - #if __cplusplus < 201103L - // Called by insert(p,x) - void -- _M_insert_aux(iterator __position, const value_type& __x); -+ _M_insert_aux(iterator __position, const value_type& __x) __attribute((noinline)); - - void -- _M_realloc_insert(iterator __position, const value_type& __x); -+ _M_realloc_insert(iterator __position, const value_type& __x) __attribute((noinline)); - #else - // A value_type object constructed with _Alloc_traits::construct() - // and destroyed with _Alloc_traits::destroy(). -@@ -1860,12 +1860,12 @@ - template - _GLIBCXX20_CONSTEXPR - void -- _M_insert_aux(iterator __position, _Arg&& __arg); -+ _M_insert_aux(iterator __position, _Arg&& __arg) __attribute((noinline)); - - template - _GLIBCXX20_CONSTEXPR - void -- _M_realloc_insert(iterator __position, _Args&&... __args); -+ _M_realloc_insert(iterator __position, _Args&&... __args) __attribute((noinline)); - - // Either move-construct at the end, or forward to _M_insert_aux. - _GLIBCXX20_CONSTEXPR diff --git a/dist/vespa.spec b/dist/vespa.spec index 40e5d7292cb..ffd78ab23a8 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -42,7 +42,7 @@ License: Commercial URL: http://vespa.ai Source0: vespa-%{version}.tar.gz -BuildRequires: vespa-build-dependencies >= 1.2.4 +BuildRequires: vespa-build-dependencies >= 1.2.5 Requires: %{name}-base = %{version}-%{release} Requires: %{name}-base-libs = %{version}-%{release} @@ -68,7 +68,7 @@ Requires: zstd %if 0%{?el8} %global _centos_stream %(grep -qs '^NAME="CentOS Stream"' /etc/os-release && echo 1 || echo 0) -%define _devtoolset_enable /opt/rh/gcc-toolset-12/enable +%define _devtoolset_enable /opt/rh/gcc-toolset/enable %define _use_vespa_gtest 1 %define _use_vespa_openblas 1 @@ -85,7 +85,7 @@ Requires: vespa-gtest = 1.13.0 %if 0%{?el9} %global _centos_stream %(grep -qs '^NAME="CentOS Stream"' /etc/os-release && echo 1 || echo 0) -%define _devtoolset_enable /opt/rh/gcc-toolset-12/enable +%define _devtoolset_enable /opt/rh/gcc-toolset/enable %define _use_vespa_protobuf 1 Requires: gtest @@ -278,21 +278,6 @@ Vespa - The open big data serving engine - devel package %endif %else %setup -q -file_to_patch=/opt/rh/gcc-toolset-12/root/usr/include/c++/12/bits/stl_vector.h -if test -f $file_to_patch -then - if grep -qs '_M_realloc_insert(iterator __position, const value_type& __x) __attribute((noinline))' $file_to_patch - then - : - else - if test -w $file_to_patch - then - patch $file_to_patch < dist/patch.stl_vector.h.diff - else - echo "Failed patching $file_to_patch since it is not writable for me" - fi - fi -fi echo '%{version}' > VERSION case '%{version}' in diff --git a/screwdriver/build-vespa.sh b/screwdriver/build-vespa.sh index 72b26e1032e..7036a9ba7b2 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-12.sh +source /etc/profile.d/enable-gcc-toolset.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 2df0f87d410..c0875c18e6e 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-12/root/usr/bin +prepend_path /opt/rh/gcc-toolset/root/usr/bin # Maven is needed for tester applications prepend_path "$VESPA_HOME/local/maven/bin" -- cgit v1.2.3