From 5990b071d1d1bb8a8bd0b0f902c8b6c1ca991361 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 9 Feb 2018 11:26:43 +0100 Subject: --disable-pdfium for Linux aarch64 Flatpak build At least current PDFium master 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 "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 "update to 5.4.0 alpha1". Change-Id: I39385c332ddd6a2a3a221f0d0577181709944313 (cherry picked from commit ffc134445ef7e935d18d816626f64e65b4cdbca6) Reviewed-on: https://gerrit.libreoffice.org/49514 Reviewed-by: Stephan Bergmann Tested-by: Stephan Bergmann --- solenv/flatpak-manifest.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 3edd0b09f216..6619c04fde72 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'" -- cgit