From bd6025efb4eab878bd6f8a064f5c710f7c724baa Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 2 Jan 2018 16:57:44 +0100 Subject: Add JVM support to Flatpak ...fixing "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 .) 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 Reviewed-by: Stephan Bergmann (cherry picked from commit 22effe2b8edf46539bde34497c6ac3201d70f5ed) Conflicts: solenv/flatpak-manifest.in Change-Id: I5b67c37f168533f9dc7ade11c7c4e2c42814b942 Reviewed-on: https://gerrit.libreoffice.org/47401 Tested-by: Jenkins Reviewed-by: Michael Stahl --- distro-configs/LibreOfficeFlatpak.conf | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'distro-configs') 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 -- cgit