diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-01-28 09:05:22 +0100 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2019-01-28 17:16:49 +0100 |
| commit | fefaf392343f65c65f40ab785fe11c8cd50623e3 (patch) | |
| tree | 6b24d7e6f6a54be11ed7215145532c26bbe48282 /solenv | |
| parent | 360844f902cdbcbe787659628892a5a28702c66d (diff) | |
org.freedesktop.Sdk//18.08 `uname -i` always returns "unknown"
(cf. <https://github.com/flathub/org.libreoffice.LibreOffice/pull/67/commits/
deda15380b436ca8fe62e2ebc1feec8bcb6dd43e> "org.freedesktop.Sdk//18.08 `uname -i`
always returns 'unknown'")
Change-Id: Id158d769edb07aa09189907d120cb1e9cd8d9b17
Reviewed-on: https://gerrit.libreoffice.org/66985
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit fcc5fc76c33de566cb2d02be541dcbde29d1eb8a)
Reviewed-on: https://gerrit.libreoffice.org/67003
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/flatpak-manifest.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index d3b2fea02d0a..36ec66991ebc 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -551,7 +551,7 @@ "buildsystem": "simple", "build-commands": [ "./autogen.sh --prefix=/run/build/libreoffice/inst --with-distro=LibreOfficeFlatpak", - "make $(if test \"$(uname -i)\" = i386; then printf build-nocheck; fi)", + "make $(if test \"$FLATPAK_ARCH\" = i386; then printf build-nocheck; fi)", "make distro-pack-install", "make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'", "desktop-file-edit --set-key=X-Endless-Alias --set-value=libreoffice-startcenter /app/share/applications/org.libreoffice.LibreOffice.desktop", |