diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-02 16:57:44 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2018-01-04 20:41:34 +0100 |
| commit | bd6025efb4eab878bd6f8a064f5c710f7c724baa (patch) | |
| tree | 079d16e63ee93fd727b8328e0038384b124996b4 /distro-configs | |
| parent | db15e9345b96d888070a49b9b7fbe9098435af18 (diff) | |
Add JVM support to Flatpak
...fixing <https://github.com/flathub/org.libreoffice.LibreOffice/issues/5>
"Add JRE-based components".
It appeared to be easiest to install the Ant build-time dependency to
/run/build/libreoffice/ant, instead of making it into a flatpak-builder module
of its own. (The sha512 is as given at
<http://ant.apache.org/bindownload.cgi>.)
To avoid further dependencies, configure --without-export-validation and
--without-junit, only affecting build-time checks (and the amount of checks thus
affected by a plain `make` should be small).
Reviewed-on: https://gerrit.libreoffice.org/47322
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 22effe2b8edf46539bde34497c6ac3201d70f5ed)
Conflicts:
solenv/flatpak-manifest.in
Change-Id: I5b67c37f168533f9dc7ade11c7c4e2c42814b942
Reviewed-on: https://gerrit.libreoffice.org/47401
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'distro-configs')
| -rw-r--r-- | distro-configs/LibreOfficeFlatpak.conf | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf index 99cce2765702..bb6b12b567c4 100644 --- a/distro-configs/LibreOfficeFlatpak.conf +++ b/distro-configs/LibreOfficeFlatpak.conf @@ -1,10 +1,15 @@ --disable-odk --enable-release-build +--with-ant-home=/run/build/libreoffice/ant --with-extra-buildid=Flatpak version +--with-jdk-home=/usr/lib/sdk/openjdk9/jvm/openjdk-9 --with-lang=ALL --with-system-libs --with-vendor=The Document Foundation ---without-java +--without-export-validation +--without-junit +--without-system-apache-commons +--without-system-beanshell --without-system-bluez --without-system-boost --without-system-clucene @@ -13,6 +18,7 @@ --without-system-firebird --without-system-glm --without-system-gpgmepp +--without-system-jfreereport --without-system-libabw --without-system-libcdr --without-system-libcmis |