diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-02-09 12:01:53 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-02-09 18:05:21 +0100 |
| commit | f3062fd2e39819bcb1e8bbb76355cc50d7257652 (patch) | |
| tree | a2959feb91f636bebb2e2aa2689acb74d3e38b7d /solenv | |
| parent | ffc134445ef7e935d18d816626f64e65b4cdbca6 (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
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/flatpak-manifest.in | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 0bbd0319d49d..0ad8a349c441 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": [ |