diff --git a/0001-Use-jobserver-on-LTO-from-make.patch b/0001-Use-jobserver-on-LTO-from-make.patch deleted file mode 100644 index c8310c3..0000000 --- a/0001-Use-jobserver-on-LTO-from-make.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c87570aad9f4675f2bba9233f12f53d9fa287c51 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= -Date: Fri, 6 Apr 2018 16:33:39 +0200 -Subject: [PATCH] Use jobserver on LTO from make - -This should avoid executing PARALELISM threads for each linker call but -rather limits it to the basic jobs given to make. - -Previous behaviour could be 8 make threads, each spawning 8 LTO threads, -while here it should append its jobs to make and leave it to the make -itself to distribute. - -Change-Id: Ib22bd21dfae60eb0eb8ac7b9c1c277b152378294 ---- - solenv/gbuild/platform/com_GCC_defs.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk -index ac3cbc366cf7..4180144bdec4 100644 ---- a/solenv/gbuild/platform/com_GCC_defs.mk -+++ b/solenv/gbuild/platform/com_GCC_defs.mk -@@ -158,7 +158,7 @@ ifeq ($(COM_IS_CLANG),TRUE) - gb_LTOFLAGS := -flto - gb_LTOPLUGINFLAGS := --plugin LLVMgold.so - else --gb_LTOFLAGS := -flto=$(PARALLELISM) -fuse-linker-plugin -O2 -+gb_LTOFLAGS := -flto=jobserver -fuse-linker-plugin -O2 - endif - endif - --- -2.16.3 - diff --git a/libreoffice.changes b/libreoffice.changes index ee6075e..7aa7c1e 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -3,7 +3,6 @@ Fri Apr 6 14:27:40 UTC 2018 - tchvatal@suse.com - Switch to memory-constraints macros to limit threads as needed - Enable LTO on libreoffice, 16% smaller binaries, less memory used: - * 0001-Use-jobserver-on-LTO-from-make.patch ------------------------------------------------------------------- Tue Apr 3 12:26:41 UTC 2018 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 9a6a275..80cf234 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -97,8 +97,6 @@ Patch5: 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch Patch7: bnc1039203.patch # LO-L3: Slide with chart has some strange (too large?) elements (PPTX) Patch8: bnc1060128.patch -# Upstream! this uses jobserver instead of PARALELISM for LTO -Patch9: 0001-Use-jobserver-on-LTO-from-make.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: %{name}-share-linker @@ -886,7 +884,6 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch5 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 %patch990 -p1 # Disable some of the failing tests (some are random)