diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-11-05 23:56:22 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-11-05 23:56:22 +0100 |
commit | f4a5faa9dcadc698383e15743ac5f974ee0e3c8b (patch) | |
tree | 96124567d5604c496cf8d2848ffe348de0b701ac /gnu/packages/libreoffice.scm | |
parent | 16b89ecc1f2f1f9651d119518c0e752b01f0f07b (diff) | |
parent | adde15186da7529b85097fdafffc2a13b0e60bdf (diff) | |
download | guix-f4a5faa9dcadc698383e15743ac5f974ee0e3c8b.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/libreoffice.scm')
-rw-r--r-- | gnu/packages/libreoffice.scm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 9571ba6e7d..f373383a8a 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -740,6 +740,9 @@ Works word processor file format.") (sha256 (base32 "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197")))) (build-system gnu-build-system) + (arguments + ;; A harmless 'sign-compare' error pops up on i686 so disable '-Werror'. + '(#:configure-flags '("--disable-werror"))) (inputs `(("boost" ,boost) ("icu4c" ,icu4c) @@ -1102,6 +1105,8 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") (list "--enable-release-build" "--enable-verbose" + ;; Avoid using all cpu cores by default + (format #f "--with-parallelism=~d" (parallel-job-count)) "--disable-fetch-external" ; disable downloads "--with-system-libs" ; enable all --with-system-* flags (string-append "--with-boost-libdir=" |