diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2017-12-28 20:32:30 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-12-28 20:34:41 +0100 |
| commit | dc0ab178b2ee72b4503faf897dcbddd6534667ed (patch) | |
| tree | a97f6507bb0b9b89bd04e711fe73d70e945c31d7 | |
| parent | dev-util/mdds: Add missing USE=valgrind DEPEND (diff) | |
| download | gentoo-dc0ab178b2ee72b4503faf897dcbddd6534667ed.tar.gz gentoo-dc0ab178b2ee72b4503faf897dcbddd6534667ed.tar.bz2 gentoo-dc0ab178b2ee72b4503faf897dcbddd6534667ed.zip | |
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
4 files changed, 4 insertions, 4 deletions
diff --git a/app-office/libreoffice/libreoffice-5.4.4.2.ebuild b/app-office/libreoffice/libreoffice-5.4.4.2.ebuild index 666dc122a413..303d903bcb75 100644 --- 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 f9f51d5951b9..542f04bac545 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/$(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 006b828eaf2d..9b35442a6de3 100644 --- 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 006b828eaf2d..9b35442a6de3 100644 --- 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 && \ |