diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-03-25 15:17:42 +0100 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-03-25 15:17:42 +0100 |
| commit | 9431eaea6112aa5ccd915603ef5d8b23920fec4a (patch) | |
| tree | 4a86a6fe45b1a2aa1169ddccf2f0dc3fd4cac10c /dist | |
| parent | 04aade237fab256aa7ccb88758107605855b133a (diff) | |
Remove dangling rpath and add /opt/vespa/jdk symlink
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/vespa.spec | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 4281ce243fa..afd7c10c841 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -245,7 +245,7 @@ cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_PREFIX_PATH=%{_vespa_deps_prefix} \ -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/jre-11-openjdk/lib" \ + -DCMAKE_INSTALL_RPATH="%{_prefix}/lib64%{?_extra_link_directory:;%{_extra_link_directory}}" \ %{?_vespa_llvm_version:-DVESPA_LLVM_VERSION="%{_vespa_llvm_version}"} \ -DVESPA_USER=%{_vespa_user} \ -DVESPA_UNPRIVILEGED=no \ @@ -269,6 +269,8 @@ cp %{buildroot}/%{_prefix}/etc/systemd/system/vespa.service %{buildroot}/usr/lib cp %{buildroot}/%{_prefix}/etc/systemd/system/vespa-configserver.service %{buildroot}/usr/lib/systemd/system %endif +ln -s /usr/lib/jvm/jre-11-openjdk %{buildroot}/%{_prefix}/jdk + %clean rm -rf $RPM_BUILD_ROOT |