diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2018-08-21 22:32:37 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@broadpark.no> | 2018-08-29 12:27:57 +0200 |
| commit | 293907d13f1098b03b15741f82e1342feda0c972 (patch) | |
| tree | dfaee50890e8ff43c3f39445052b64d5b593e534 /dist | |
| parent | ba5d60fbbef2efb0b2ed09e56d55db04db2c468d (diff) | |
Use llvm 7 on Fedora 29 and Fedora 30.
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/vespa.spec | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 25ee24167f8..6aeb099e8fb 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -51,7 +51,13 @@ BuildRequires: gtest-devel BuildRequires: gmock-devel %endif %if 0%{?fc29} -BuildRequires: llvm-devel >= 6.0.1 +BuildRequires: llvm-devel >= 7.0.0 +BuildRequires: boost-devel >= 1.66 +BuildRequires: gtest-devel +BuildRequires: gmock-devel +%endif +%if 0%{?fc30} +BuildRequires: llvm-devel >= 7.0.0 BuildRequires: boost-devel >= 1.66 BuildRequires: gtest-devel BuildRequires: gmock-devel @@ -116,8 +122,12 @@ Requires: llvm-libs >= 6.0.1 %define _vespa_llvm_version 6.0 %endif %if 0%{?fc29} -Requires: llvm-libs >= 6.0.1 -%define _vespa_llvm_version 6.0 +Requires: llvm-libs >= 7.0.0 +%define _vespa_llvm_version 7 +%endif +%if 0%{?fc30} +Requires: llvm-libs >= 7.0.0 +%define _vespa_llvm_version 7 %endif %define _extra_link_directory /opt/vespa-cppunit/lib%{?_vespa_llvm_link_directory:;%{_vespa_llvm_link_directory}}%{?_vespa_gtest_link_directory:;%{_vespa_gtest_link_directory}} %define _extra_include_directory /opt/vespa-cppunit/include%{?_vespa_llvm_include_directory:;%{_vespa_llvm_include_directory}}%{?_vespa_gtest_include_directory:;%{_vespa_gtest_include_directory}} |