app-office/libreoffice: Revert Use $(get_libdir) instead of hardcoded

This reverts commit 5a2580630d7da08361bca09e86df2c2664c2f605.
Thanks-to: James Le Cuirot <chewi@gentoo.org>
Bug: https://bugs.gentoo.org/641826

diff --git a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild b/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
index 666dc122a413821ae14588c5ec0b95d16e4ff30c..303d903bcb7522e33018bf322d370a73bc3e0432 100644 (file)
--- a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.4.2.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/$(get_libdir)/"
+                       --with-jvm-path="${EPREFIX}/usr/lib/"
                )
 
                use libreoffice_extensions_scripting-beanshell && \

diff --git a/app-office/libreoffice/libreoffice-5.4.9999.ebuild b/app-office/libreoffice/libreoffice-5.4.9999.ebuild
index f9f51d5951b9e8c6b2a7a0ab4aa0184c507b13ac..542f04bac5459d0e862025932fc6132f19ece1c4 100644 (file)
--- 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/$(get_libdir)/"
+                       --with-jvm-path="${EPREFIX}/usr/lib/"
                )
 
                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 006b828eaf2d9315808bcbf6a41cfc732663c6e1..9b35442a6de347d20cc34fd7c8f17bcc0fb002c5 100644 (file)
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -478,7 +478,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/$(get_libdir)/"
+                       --with-jvm-path="${EPREFIX}/usr/lib/"
                )
 
                use libreoffice_extensions_scripting-beanshell && \

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 006b828eaf2d9315808bcbf6a41cfc732663c6e1..9b35442a6de347d20cc34fd7c8f17bcc0fb002c5 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -478,7 +478,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/$(get_libdir)/"
+                       --with-jvm-path="${EPREFIX}/usr/lib/"
                )
 
                use libreoffice_extensions_scripting-beanshell && \