diff options
| author | Geir Storli <geirst@verizonmedia.com> | 2019-04-02 12:24:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-02 12:24:01 +0200 |
| commit | 67f18277a9d68bb35bca00e25b38378495bcdd6a (patch) | |
| tree | 0a6e5e82a05f404be1941bacd0df88467a163040 | |
| parent | e285daefde67584e692ac47737df7ddc41ca2d95 (diff) | |
| parent | c178d8a19da04a7bc8e3e2a13f373fdda27197bc (diff) | |
Merge pull request #8987 from vespa-engine/geirst/simplify-link-and-include-dirs
Simplify link and include directories now that 3rd-party deps are ins…
| -rwxr-xr-x | bootstrap-cmake.sh | 6 | ||||
| -rw-r--r-- | dist/vespa.spec | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/bootstrap-cmake.sh b/bootstrap-cmake.sh index b62bf617c1c..8f6bf953e6f 100755 --- a/bootstrap-cmake.sh +++ b/bootstrap-cmake.sh @@ -54,9 +54,9 @@ cmake3 \ -DCMAKE_INSTALL_PREFIX=${VESPA_INSTALL_PREFIX} \ -DJAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-openjdk} \ -DCMAKE_PREFIX_PATH="/opt/vespa-deps" \ - -DEXTRA_LINK_DIRECTORY="/opt/vespa-deps/lib64;/opt/vespa-gtest/lib64;/opt/vespa-boost/lib;/opt/vespa-cppunit/lib;/usr/lib64/llvm$VESPA_LLVM_VERSION/lib" \ - -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-deps/include;/opt/vespa-gtest/include;/opt/vespa-boost/include;/opt/vespa-cppunit/include;/usr/include/llvm$VESPA_LLVM_VERSION" \ - -DCMAKE_INSTALL_RPATH="${VESPA_INSTALL_PREFIX}/lib64;/opt/vespa-deps/lib64;/opt/vespa-gtest/lib64;/opt/vespa-boost/lib;/opt/vespa-cppunit/lib;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server;/usr/lib64/llvm$VESPA_LLVM_VERSION/lib" \ + -DEXTRA_LINK_DIRECTORY="/opt/vespa-deps/lib64;/usr/lib64/llvm$VESPA_LLVM_VERSION/lib" \ + -DEXTRA_INCLUDE_DIRECTORY="/opt/vespa-deps/include;/usr/include/llvm$VESPA_LLVM_VERSION" \ + -DCMAKE_INSTALL_RPATH="${VESPA_INSTALL_PREFIX}/lib64;/opt/vespa-deps/lib64;/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server;/usr/lib64/llvm$VESPA_LLVM_VERSION/lib" \ ${UNPRIVILEGED_ARGS} \ ${EXTRA_CMAKE_ARGS} \ -DVESPA_LLVM_VERSION=$VESPA_LLVM_VERSION \ diff --git a/dist/vespa.spec b/dist/vespa.spec index fd1db572031..79c1e170083 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -120,16 +120,14 @@ Requires: net-tools Requires: llvm5.0 Requires: vespa-protobuf >= 3.7.0-4 %define _vespa_llvm_version 5.0 -%define _extra_link_directory /usr/lib64/llvm5.0/lib;/opt/vespa-gtest/lib64;/opt/vespa-cppunit/lib;%{_vespa_deps_prefix}/lib64 -%define _extra_include_directory /usr/include/llvm5.0;/opt/vespa-boost/include;/opt/vespa-gtest/include;/opt/vespa-cppunit/include;%{_vespa_deps_prefix}/include +%define _extra_link_directory /usr/lib64/llvm5.0/lib;%{_vespa_deps_prefix}/lib64 +%define _extra_include_directory /usr/include/llvm5.0;%{_vespa_deps_prefix}/include %endif %if 0%{?fedora} Requires: vespa-protobuf >= 3.7.0-4 %if 0%{?fc27} Requires: llvm-libs >= 5.0.2 %define _vespa_llvm_version 5.0 -%define _vespa_gtest_link_directory /opt/vespa-gtest/lib64 -%define _vespa_gtest_include_directory /opt/vespa-gtest/include %endif %if 0%{?fc28} Requires: llvm-libs >= 6.0.1 @@ -147,8 +145,8 @@ Requires: llvm-libs >= 8.0.0 Requires: llvm-libs >= 8.0.0 %define _vespa_llvm_version 8 %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}};%{_vespa_deps_prefix}/lib64 -%define _extra_include_directory /opt/vespa-cppunit/include%{?_vespa_llvm_include_directory:;%{_vespa_llvm_include_directory}}%{?_vespa_gtest_include_directory:;%{_vespa_gtest_include_directory}};%{_vespa_deps_prefix}/include +%define _extra_link_directory %{_vespa_deps_prefix}/lib64 +%define _extra_include_directory %{_vespa_deps_prefix}/include %endif Requires: java-11-openjdk Requires: openssl |