diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-02-14 15:06:21 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-02-14 15:10:09 +0100 |
| commit | d49a0b7391d43b9e4f8e14f9a9bf0bb2223d0025 (patch) | |
| tree | 29b2b0e72bf2ae854113c931c88c1677a5373de8 /solenv/flatpak-manifest.in | |
| parent | 54a5b5d7f3e8ebe52783379aa67fad41de32a695 (diff) | |
Revert "--disable-pdfium for Linux aarch64 Flatpak build"
...which should no longer be needed w/ 9efd288b31e259b964097d3eeeff7f6c10945cb3
"pdfium: disable custom allocator". (On Flathub, the original problem had been
seen with worker gnome-aarch64-1 using 64K pages, but not with arm-1/arm-3 using
4K pages.)
This reverts commit ffc134445ef7e935d18d816626f64e65b4cdbca6.
Conflicts:
solenv/flatpak-manifest.in
Change-Id: I7d169ba92cdcd651b1c560aabf0d4559fad8cf9c
Diffstat (limited to 'solenv/flatpak-manifest.in')
| -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 cbe5b6a226c7..ae78d0823953 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -548,7 +548,7 @@ ], "buildsystem": "simple", "build-commands": [ - "./autogen.sh --prefix=/run/build/libreoffice/inst --with-distro=LibreOfficeFlatpak --disable-symbols $(if test \"$(uname -m)\" = aarch64; then printf %s --disable-pdfium; fi)", + "./autogen.sh --prefix=/run/build/libreoffice/inst --with-distro=LibreOfficeFlatpak --disable-symbols", "make $(if test \"$(uname -i)\" = i386; then printf build-nocheck; fi)", "make distro-pack-install", "make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'" |