diff options
author | Henning Baldersheim <balder@oath.com> | 2018-08-10 16:01:46 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@oath.com> | 2018-08-10 16:01:46 +0200 |
commit | 8cb04ff558d300fd75f1fcdff280ea09e89980f5 (patch) | |
tree | f7b1bb45ad290eb94542d6530f77655994e7c2a8 /dist | |
parent | 0102c86912c5633ec5a4ef47c15f0819833e4ea3 (diff) |
Use most recent llvm possible on standard os supported.
Diffstat (limited to 'dist')
-rw-r--r-- | dist/vespa.spec | 43 |
1 files changed, 13 insertions, 30 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index bd2bf798e58..94d92582fdc 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -32,31 +32,26 @@ BuildRequires: libatomic BuildRequires: Judy-devel %if 0%{?centos} BuildRequires: cmake3 -BuildRequires: llvm3.9-devel +BuildRequires: llvm5.0-devel BuildRequires: vespa-boost-devel >= 1.59.0-6 BuildRequires: vespa-gtest >= 1.8.0-1 %endif %if 0%{?fedora} BuildRequires: cmake >= 3.9.1 BuildRequires: maven -%if 0%{?fc26} -BuildRequires: llvm-devel >= 4.0 -BuildRequires: boost-devel >= 1.63 -BuildRequires: vespa-gtest >= 1.8.0-2 -%endif %if 0%{?fc27} -BuildRequires: llvm4.0-devel >= 4.0 +BuildRequires: llvm-devel >= 5.0.2 BuildRequires: boost-devel >= 1.64 BuildRequires: vespa-gtest >= 1.8.0-2 %endif %if 0%{?fc28} -BuildRequires: llvm4.0-devel >= 4.0 +BuildRequires: llvm-devel >= 6.0.1 BuildRequires: boost-devel >= 1.66 BuildRequires: gtest-devel BuildRequires: gmock-devel %endif %if 0%{?fc29} -BuildRequires: llvm3.9-devel >= 3.9.1 +BuildRequires: llvm-devel >= 6.0.1 BuildRequires: boost-devel >= 1.66 BuildRequires: gtest-devel BuildRequires: gmock-devel @@ -104,36 +99,24 @@ Requires: perf Requires: gdb Requires: net-tools %if 0%{?centos} -Requires: llvm3.9 -%define _extra_link_directory /usr/lib64/llvm3.9/lib;/opt/vespa-gtest/lib;/opt/vespa-cppunit/lib -%define _extra_include_directory /usr/include/llvm3.9;/opt/vespa-boost/include;/opt/vespa-gtest/include;/opt/vespa-cppunit/include +Requires: llvm5.0 +%define _extra_link_directory /usr/lib64/llvm5.0/lib;/opt/vespa-gtest/lib;/opt/vespa-cppunit/lib +%define _extra_include_directory /usr/include/llvm5.0;/opt/vespa-boost/include;/opt/vespa-gtest/include;/opt/vespa-cppunit/include %endif %if 0%{?fedora} -%if 0%{?fc26} -Requires: llvm-libs >= 4.0 -%define _vespa_llvm_version 4.0 -%define _vespa_gtest_link_directory /opt/vespa-gtest/lib -%define _vespa_gtest_include_directory /opt/vespa-gtest/include -%endif %if 0%{?fc27} -Requires: llvm4.0-libs >= 4.0 -%define _vespa_llvm_version 4.0 -%define _vespa_llvm_link_directory /usr/lib64/llvm4.0/lib -%define _vespa_llvm_include_directory /usr/include/llvm4.0 +Requires: llvm-libs >= 5.0.2 +%define _vespa_llvm_version 5.0 %define _vespa_gtest_link_directory /opt/vespa-gtest/lib %define _vespa_gtest_include_directory /opt/vespa-gtest/include %endif %if 0%{?fc28} -Requires: llvm4.0-libs >= 4.0 -%define _vespa_llvm_version 4.0 -%define _vespa_llvm_link_directory /usr/lib64/llvm4.0/lib -%define _vespa_llvm_include_directory /usr/include/llvm4.0 +Requires: llvm-libs >= 6.0.1 +%define _vespa_llvm_version 6.0 %endif %if 0%{?fc29} -Requires: llvm3.9-libs >= 3.9.1 -%define _vespa_llvm_version 3.9 -%define _vespa_llvm_link_directory /usr/lib64/llvm3.9/lib -%define _vespa_llvm_include_directory /usr/include/llvm3.9 +Requires: llvm-libs >= 6.0.1 +%define _vespa_llvm_version 6.0 %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}} |