diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2019-01-21 14:39:33 +0100 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:30 +0100 |
| commit | eb0b1134a66507e3bd8f09793c22cd824d01dff5 (patch) | |
| tree | 660ce3ef61f060b33bd97eac1185715606b8e2bd | |
| parent | c8d759a609620d93288393279a00d97c29677653 (diff) | |
Adjust java dependencies and path to java libraries.
| -rw-r--r-- | dist/vespa.spec | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 6aeb099e8fb..b2d9499085f 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -67,7 +67,7 @@ BuildRequires: lz4-devel BuildRequires: libzstd-devel BuildRequires: zlib-devel BuildRequires: libicu-devel -BuildRequires: java-1.8.0-openjdk-devel +BuildRequires: java-11-openjdk-devel BuildRequires: openssl-devel BuildRequires: rpm-build BuildRequires: make @@ -132,7 +132,7 @@ Requires: llvm-libs >= 7.0.0 %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}} %endif -Requires: java-1.8.0-openjdk +Requires: java-11-openjdk Requires: openssl Requires: vespa-cppunit >= 1.12.1-6 Requires(pre): shadow-utils @@ -155,14 +155,16 @@ source %{_devtoolset_enable} || true %if 0%{?_rhmaven35_enable:1} source %{_rhmaven35_enable} || true %endif +alternatives --set java java-11-openjdk.x86_64 +alternatives --set javac java-11-openjdk.x86_64 export FACTORY_VESPA_VERSION=%{version} sh bootstrap.sh java mvn --batch-mode -nsu -T 1 install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DJAVA_HOME=/usr/lib/jvm/java-openjdk \ + -DJAVA_HOME=/usr/lib/jvm/java-11-openjdk \ -DEXTRA_LINK_DIRECTORY="%{_extra_link_directory}" \ -DEXTRA_INCLUDE_DIRECTORY="%{_extra_include_directory}" \ - -DCMAKE_INSTALL_RPATH="%{_prefix}/lib64%{?_extra_link_directory:;%{_extra_link_directory}};/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server" \ + -DCMAKE_INSTALL_RPATH="%{_prefix}/lib64%{?_extra_link_directory:;%{_extra_link_directory}};/usr/lib/jvm/jre-11-openjdk/lib" \ %{?_vespa_llvm_version:-DVESPA_LLVM_VERSION="%{_vespa_llvm_version}"} \ . |