diff options
| -rwxr-xr-x | bootstrap-cmake.sh | 4 | ||||
| -rw-r--r-- | dist/vespa.spec | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/bootstrap-cmake.sh b/bootstrap-cmake.sh index b484d41e8b6..df6f53e8ae5 100755 --- a/bootstrap-cmake.sh +++ b/bootstrap-cmake.sh @@ -50,9 +50,9 @@ fi cmake3 \ -DCMAKE_INSTALL_PREFIX=${VESPA_INSTALL_PREFIX} \ -DJAVA_HOME=/usr/lib/jvm/java-openjdk \ - -DEXTRA_LINK_DIRECTORY="/opt/vespa-gtest/lib;/opt/vespa-boost/lib;/opt/vespa-cppunit/lib;/usr/lib64/llvm$VESPA_LLVM_VERSION/lib" \ + -DEXTRA_LINK_DIRECTORY="/opt/vespa-gtest/lib64;/opt/vespa-boost/lib;/opt/vespa-cppunit/lib;/usr/lib64/llvm$VESPA_LLVM_VERSION/lib" \ -DEXTRA_INCLUDE_DIRECTORY="/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-gtest/lib;/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" \ + -DCMAKE_INSTALL_RPATH="${VESPA_INSTALL_PREFIX}/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" \ ${UNPRIVILEGED_ARGS} \ ${EXTRA_CMAKE_ARGS} \ -DVESPA_LLVM_VERSION=$VESPA_LLVM_VERSION \ diff --git a/dist/vespa.spec b/dist/vespa.spec index 0a9e8a284ce..ca53c5969d8 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -34,7 +34,7 @@ BuildRequires: Judy-devel BuildRequires: cmake3 BuildRequires: llvm5.0-devel BuildRequires: vespa-boost-devel >= 1.59.0-6 -BuildRequires: vespa-gtest >= 1.8.0-1 +BuildRequires: vespa-gtest >= 1.8.1-1 %endif %if 0%{?fedora} BuildRequires: cmake >= 3.9.1 @@ -42,7 +42,7 @@ BuildRequires: maven %if 0%{?fc27} BuildRequires: llvm-devel >= 5.0.2 BuildRequires: boost-devel >= 1.64 -BuildRequires: vespa-gtest >= 1.8.0-2 +BuildRequires: vespa-gtest >= 1.8.1-1 %endif %if 0%{?fc28} BuildRequires: llvm-devel >= 6.0.1 @@ -110,14 +110,14 @@ Requires: net-tools %if 0%{?centos} Requires: llvm5.0 %define _vespa_llvm_version 5.0 -%define _extra_link_directory /usr/lib64/llvm5.0/lib;/opt/vespa-gtest/lib;/opt/vespa-cppunit/lib +%define _extra_link_directory /usr/lib64/llvm5.0/lib;/opt/vespa-gtest/lib64;/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%{?fc27} Requires: llvm-libs >= 5.0.2 %define _vespa_llvm_version 5.0 -%define _vespa_gtest_link_directory /opt/vespa-gtest/lib +%define _vespa_gtest_link_directory /opt/vespa-gtest/lib64 %define _vespa_gtest_include_directory /opt/vespa-gtest/include %endif %if 0%{?fc28} |