commit: 5a2580630d7da08361bca09e86df2c2664c2f605
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 13 21:56:31 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 13 23:18:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a258063
app-office/libreoffice: Use $(get_libdir) instead of hardcoded
Package-Manager: Portage-2.3.18, Repoman-2.3.6
app-office/libreoffice/libreoffice-5.4.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 2 +-
app-office/libreoffice/libreoffice-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild
b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
index 542f04bac54..f9f51d5951b 100644
--- a/app-office/libreoffice/libreoffice-5.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
@@ -475,7 +475,7 @@ src_configure() {
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
+ --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
)
use libreoffice_extensions_scripting-beanshell && \
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 6422eb9c9f8..46cbbf6aec2 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -476,7 +476,7 @@ src_configure() {
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
+ --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
)
use libreoffice_extensions_scripting-beanshell && \
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild
b/app-office/libreoffice/libreoffice-9999.ebuild
index 6422eb9c9f8..46cbbf6aec2 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -476,7 +476,7 @@ src_configure() {
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
- --with-jvm-path="${EPREFIX}/usr/lib/"
+ --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
)
use libreoffice_extensions_scripting-beanshell && \
