summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-02-09 11:26:43 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-02-09 18:03:19 +0100
commitffc134445ef7e935d18d816626f64e65b4cdbca6 (patch)
tree9e61e4772dfc0498de95553b19f94a80604b543e
parent02248e9e191f798f96218a0c4d281f99e15bea31 (diff)
--disable-pdfium for Linux aarch64 Flatpak build
At least current PDFium master <https://pdfium.googlesource.com/pdfium/+/ 026717cb667cf0c7215cf55daf794d69752fc900/third_party/base/allocator/ partition_allocator/page_allocator.h#33> still hard-codes the assumption that "All Blink-supported systems have 4096 sized system pages". On Linux aarch64 machines with 64K page size (as reported by `getconf PAGE_SIZE`, e.g., on Flathub worker <https://flathub.org/builds/#/workers/18> "gnome-aarch64-1"), that causes LO's CppunitTest_svtools_graphic to fail with SIGABRT, when pdfium::base::SetSystemPagesInaccessible (workdir/UnpackedTarball/pdfium/ third_party/base/allocator/partition_allocator/page_allocator.cpp) causes an mprotect to fail in a pattern like > mmap(0x1051200000, 2097152, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x1051200000 > mprotect(0x1051200000, 4096, PROT_NONE) = 0 > mprotect(0x1051202000, 8192, PROT_NONE) = -1 EINVAL (Invalid argument) The loss of functionality caused by --disable-pdfium is assumed to be acceptable ("used for insert->image and selecting a pdf I believe", according to caolan on IRC), and e.g. Fedora disables it for all arches since <https://src.fedoraproject.org/rpms/libreoffice/c/ 1f6713e951de6aa9af43a9bd92ed011edf0c6fe9> "update to 5.4.0 alpha1". Change-Id: I39385c332ddd6a2a3a221f0d0577181709944313
-rw-r--r--solenv/flatpak-manifest.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index c64ed249ffa8..0bbd0319d49d 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -532,7 +532,7 @@
],
"buildsystem": "simple",
"build-commands": [
- "./autogen.sh --prefix=/run/build/libreoffice/inst --with-distro=LibreOfficeFlatpak --disable-symbols",
+ "./autogen.sh --prefix=/run/build/libreoffice/inst --with-distro=LibreOfficeFlatpak --disable-symbols $(if test \"$(uname -m)\" = aarch64; then printf %s --disable-pdfium; fi)",
"make",
"make distro-pack-install",
"make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'"