diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-11-24 16:08:28 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-11-24 16:08:28 +0000 |
| commit | 2b25473f007b1eeedb2935d4c49bfb09d8e01746 (patch) | |
| tree | b1fedbd97024482ff90b4c2ea4d5d756b2a42994 /dist | |
| parent | 47c0a665239b09476fa61277520c20672c357ff5 (diff) | |
Avoid refering version of toolset everywhere.
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/patch.stl_vector.h.diff | 30 | ||||
| -rw-r--r-- | dist/vespa.spec | 21 |
2 files changed, 3 insertions, 48 deletions
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<typename _Arg> - _GLIBCXX20_CONSTEXPR - void -- _M_insert_aux(iterator __position, _Arg&& __arg); -+ _M_insert_aux(iterator __position, _Arg&& __arg) __attribute((noinline)); - - template<typename... _Args> - _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 |