Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3320
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/20/3320/1
vcl: conditionally link to jvmaccess
When SOLAR_JAVA (Java) is not there, vcl plugins
will not link against jvmaccess.
Change-Id: I13e1ae7d605965b3609c6dfdaa66faa976382e65
---
M vcl/Library_vclplug_gen.mk
M vcl/Library_vclplug_gtk.mk
M vcl/Library_vclplug_gtk3.mk
M vcl/Library_vclplug_kde.mk
M vcl/Library_vclplug_kde4.mk
M vcl/Library_vclplug_svp.mk
M vcl/Library_vclplug_tde.mk
7 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index f3c6d7d..bea09db 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -37,7 +37,8 @@
cppuhelper \
i18nlangtag \
i18nutil \
- jvmaccess \
+ $(if $(filter TRUE,$(SOLAR_JAVA)), \
+ jvmaccess) \
cppu \
sal \
))
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index 6607d10..8c4d808 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -50,7 +50,8 @@
cppuhelper \
i18nlangtag \
i18nutil \
- jvmaccess \
+ $(if $(filter TRUE,$(SOLAR_JAVA)), \
+ jvmaccess) \
cppu \
sal \
))
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index cd9b63a..948e528 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -60,7 +60,8 @@
cppuhelper \
i18nlangtag \
i18nutil \
- jvmaccess \
+ $(if $(filter TRUE,$(SOLAR_JAVA)), \
+ jvmaccess) \
cppu \
sal \
))
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index 5e9c666..1eedaa5 100644
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -46,7 +46,8 @@
cppuhelper \
i18nlangtag \
i18nutil \
- jvmaccess \
+ $(if $(filter TRUE,$(SOLAR_JAVA)), \
+ jvmaccess) \
cppu \
sal \
))
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index 93f6858..45e1042 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -44,7 +44,8 @@
cppuhelper \
i18nlangtag \
i18nutil \
- jvmaccess \
+ $(if $(filter TRUE,$(SOLAR_JAVA)), \
+ jvmaccess) \
cppu \
sal \
))
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
index 7d40e5e..32e88dd 100644
--- a/vcl/Library_vclplug_svp.mk
+++ b/vcl/Library_vclplug_svp.mk
@@ -46,7 +46,8 @@
cppuhelper \
i18nlangtag \
i18nutil \
- jvmaccess \
+ $(if $(filter TRUE,$(SOLAR_JAVA)), \
+ jvmaccess) \
cppu \
sal \
))
diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk
index f2c992b..2abfce0 100644
--- a/vcl/Library_vclplug_tde.mk
+++ b/vcl/Library_vclplug_tde.mk
@@ -68,7 +68,8 @@
cppuhelper \
i18nlangtag \
i18nutil \
- jvmaccess \
+ $(if $(filter TRUE,$(SOLAR_JAVA)), \
+ jvmaccess) \
cppu \
sal \
))
--
To view, visit https://gerrit.libreoffice.org/3320
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I13e1ae7d605965b3609c6dfdaa66faa976382e65
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Andres Gomez <agomez@igalia.com>
Context
- [PATCH] vcl: conditionally link to jvmaccess · Andres Gomez (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.