diff options
| author | Tor Egge <Tor.Egge@online.no> | 2022-10-15 22:11:21 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@online.no> | 2022-10-15 22:11:21 +0200 |
| commit | c84a2bb8a5d427956c30b05f999d2d6b8600f92c (patch) | |
| tree | f21416914b32f63860da81b4cbfcb16738266d52 /dist | |
| parent | d9ecde738a23e7e0048c2e8b3c17601cc1db8b8d (diff) | |
Don't patch LLVM header files.
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/STLExtras.h.diff | 20 | ||||
| -rw-r--r-- | dist/vespa.spec | 6 |
2 files changed, 0 insertions, 26 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 26362c0f64e..15b6dc287d5 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -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) |