summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-02-09 12:01:53 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-02-09 19:42:48 +0100
commit4ee2dec9b4d9db2fa2678eeb965c5f52a8ceb616 (patch)
tree10cd729098128a7b8b28adf92de2d83103908e1f
parent5990b071d1d1bb8a8bd0b0f902c8b6c1ca991361 (diff)
solenv/flatpak-manifest.in: Merge in building with GCC 7
This merges in * <https://github.com/flathub/org.libreoffice.LibreOffice/commit/ d1ca6fbdac7f0adcfd813ac5556d6ad979924232> "switch to gcc7", * <https://github.com/flathub/org.libreoffice.LibreOffice/commit/ 687e79514c12bb8c6fd7dfd93f1e4fb84fc6af54> "Copy org.freedesktop.Sdk.Extension.gcc7 libs into app", and * <https://github.com/flathub/org.libreoffice.LibreOffice/commit/ 41b361bf4973b0981f834fe58b3f808b0ca81634> "Use `cp -d` to preserve symlinks", which should allow to build on 32-bit arm once <https://github.com/flathub/org.freedesktop.Sdk.Extension.openjdk9/issues/4> "ARM version" is fixed. Those had been reverted again on flathub with <https://github.com/flathub/ org.libreoffice.LibreOffice/commit/1168072d19f358ffacc783aa83773789c6eafb99> "Revert 'Gcc7' again, for now" because it had apeared back then that using GCC 7 caused the build to fail on aarch64. This has meanwhile been tracked down to be an issue with PDFium instead, see ffc134445ef7e935d18d816626f64e65b4cdbca6 "--disable-pdfium for Linux aarch64 Flatpak build". Change-Id: I594d38ecfdf7dbd78b91af04b9f3f3e86987b8e5 (cherry picked from commit f3062fd2e39819bcb1e8bbb76355cc50d7257652) Reviewed-on: https://gerrit.libreoffice.org/49515 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--solenv/flatpak-manifest.in16
1 files changed, 16 insertions, 0 deletions
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 6619c04fde72..baff33ec3811 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -4,12 +4,28 @@
"runtime-version": "3.24",
"sdk": "org.gnome.Sdk",
"sdk-extensions": [
+ "org.freedesktop.Sdk.Extension.gcc7",
"org.freedesktop.Sdk.Extension.openjdk9"
],
+ "build-options": {
+ "env": {
+ "CC": "/usr/lib/sdk/gcc7/bin/gcc",
+ "CXX": "/usr/lib/sdk/gcc7/bin/g++",
+ "LD_LIBRARY_PATH": "/usr/lib/sdk/gcc7/lib"
+ }
+ },
"command": "/app/libreoffice/program/soffice",
"separate-locales": false,
"modules": [
{
+ "name": "gcc7",
+ "buildsystem": "simple",
+ "build-commands": [
+ "mkdir -p /app/lib",
+ "cp -d /usr/lib/sdk/gcc7/lib/lib{gcc_s.so.1,stdc++.so.6*} /app/lib"
+ ]
+ },
+ {
"name": "openjdk",
"buildsystem": "simple",
"build-commands": [