diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2018-01-23 19:28:12 +0100 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@broadpark.no> | 2018-01-23 20:23:52 +0100 |
| commit | 6cc133c0232979b5aed45d2c9f753149eb245c1d (patch) | |
| tree | 0e1aeda3ece84bce2394111c76a9e5a2ccf86905 /dist | |
| parent | 344e2c8d583b13a365f5c17ca9fc467e5d7d357d (diff) | |
Use llvm4.0 on Fedora 27 and Fedora 28.
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/vespa.spec | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index b7d84bc6d89..b0d8ffd19a1 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -48,11 +48,11 @@ BuildRequires: llvm-devel >= 4.0 BuildRequires: boost-devel >= 1.63 %endif %if 0%{?fc27} -BuildRequires: llvm-devel >= 4.0 +BuildRequires: llvm4.0-devel >= 4.0 BuildRequires: boost-devel >= 1.64 %endif %if 0%{?fc28} -BuildRequires: llvm-devel >= 4.0 +BuildRequires: llvm4.0-devel >= 4.0 BuildRequires: boost-devel >= 1.64 %endif BuildRequires: zookeeper-devel >= 3.4.9 @@ -118,18 +118,22 @@ Requires: boost >= 1.63 %define _vespa_llvm_version 4.0 %endif %if 0%{?fc27} -Requires: llvm-libs >= 4.0 +Requires: llvm4.0-libs >= 4.0 Requires: boost >= 1.64 %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 %endif %if 0%{?fc28} -Requires: llvm-libs >= 4.0 +Requires: llvm4.0-libs >= 4.0 Requires: boost >= 1.64 %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 %endif Requires: zookeeper >= 3.4.9 -%define _extra_link_directory /opt/vespa-libtorrent/lib;/opt/vespa-cppunit/lib -%define _extra_include_directory /opt/vespa-libtorrent/include;/opt/vespa-cppunit/include +%define _extra_link_directory /opt/vespa-libtorrent/lib;/opt/vespa-cppunit/lib%{?_vespa_llvm_link_directory:;%{_vespa_llvm_link_directory}} +%define _extra_include_directory /opt/vespa-libtorrent/include;/opt/vespa-cppunit/include%{?_vespa_llvm_include_directory:;%{_vespa_llvm_include_directory}} %define _vespa_boost_lib_suffix %{nil} %endif Requires: java-1.8.0-openjdk |