diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-10-16 11:44:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-16 11:44:13 +0200 |
commit | 56c7d95c6e5f4b054b40bb68a24abba38b709fd9 (patch) | |
tree | f21416914b32f63860da81b4cbfcb16738266d52 | |
parent | 0230c92a6b53c267c6d9da5507bbffdc0717c8a1 (diff) | |
parent | c84a2bb8a5d427956c30b05f999d2d6b8600f92c (diff) |
Merge pull request #24461 from vespa-engine/toregge/use-llvm-13-on-rhel-8
Use LLVM 13 on RHEL 8.
-rw-r--r-- | dist/STLExtras.h.diff | 20 | ||||
-rw-r--r-- | dist/vespa.spec | 12 |
2 files changed, 3 insertions, 29 deletions
diff --git a/dist/STLExtras.h.diff b/dist/STLExtras.h.diff deleted file mode 100644 index 40f6a2a12ba..00000000000 --- a/dist/STLExtras.h.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- STLExtras.h.orig 2021-01-28 01:34:01.000000000 +0100 -+++ STLExtras.h 2021-03-03 22:18:46.028992086 +0100 -@@ -1820,7 +1820,7 @@ - result_pair(std::size_t Index, IterOfRange<R> Iter) - : Index(Index), Iter(Iter) {} - -- result_pair<R>(const result_pair<R> &Other) -+ result_pair(const result_pair<R> &Other) - : Index(Other.Index), Iter(Other.Iter) {} - result_pair<R> &operator=(const result_pair<R> &Other) { - Index = Other.Index; -@@ -1870,7 +1870,7 @@ - return Result.Iter == RHS.Result.Iter; - } - -- enumerator_iter<R>(const enumerator_iter<R> &Other) : Result(Other.Result) {} -+ enumerator_iter(const enumerator_iter<R> &Other) : Result(Other.Result) {} - enumerator_iter<R> &operator=(const enumerator_iter<R> &Other) { - Result = Other.Result; - return *this; diff --git a/dist/vespa.spec b/dist/vespa.spec index 5982c81e591..15b6dc287d5 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -90,7 +90,7 @@ BuildRequires: (llvm-devel >= 14.0.0 and llvm-devel < 15) BuildRequires: (llvm-devel >= 13.0.1 and llvm-devel < 14) %endif %else -BuildRequires: (llvm-devel >= 12.0.1 and llvm-devel < 13) +BuildRequires: (llvm-devel >= 13.0.1 and llvm-devel < 14) %endif BuildRequires: vespa-boost-devel >= 1.76.0-1 BuildRequires: vespa-openssl-devel >= 1.1.1o-1 @@ -238,7 +238,7 @@ Requires: zstd %define _vespa_llvm_version 13 %endif %else -%define _vespa_llvm_version 12 +%define _vespa_llvm_version 13 %endif Requires: vespa-gtest = 1.11.0 %define _extra_link_directory %{_vespa_deps_prefix}/lib64 @@ -360,7 +360,7 @@ Requires: (llvm-libs >= 14.0.0 and llvm-libs < 15) Requires: (llvm-libs >= 13.0.1 and llvm-libs < 14) %endif %else -Requires: (llvm-libs >= 12.0.1 and llvm-libs < 13) +Requires: (llvm-libs >= 13.0.1 and llvm-libs < 14) %endif Requires: vespa-protobuf = 3.19.1 %endif @@ -492,12 +492,6 @@ nearest neighbor search used for low-level benchmarking. %endif %else %setup -q -%if 0%{?el8} && %{?_vespa_llvm_version}%{!?_vespa_llvm_version:13} < 13 -if grep -qs 'result_pair<R>(' /usr/include/llvm/ADT/STLExtras.h -then - patch /usr/include/llvm/ADT/STLExtras.h < dist/STLExtras.h.diff -fi -%endif echo '%{version}' > VERSION case '%{version}' in *.0) |