From a7366008e6f7cd18fb90c00c715f49a9876585916d7736fc27ffb02620691f5d Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Mon, 9 Jul 2012 18:18:45 +0000 Subject: [PATCH 1/6] Accepting request 127432 from LibreOffice:Stable - updated to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) OBS-URL: https://build.opensuse.org/request/show/127432 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=5 --- libreoffice-binfilter-3.5.4.6.tar.bz2 | 3 --- libreoffice-binfilter-3.5.4.7.tar.bz2 | 3 +++ libreoffice-branding-upstream.changes | 5 +++++ libreoffice-branding-upstream.spec | 6 +++--- libreoffice-core-3.5.4.6.tar.bz2 | 3 --- libreoffice-core-3.5.4.7.tar.bz2 | 3 +++ libreoffice-help-3.5.4.6.tar.bz2 | 3 --- libreoffice-help-3.5.4.7.tar.bz2 | 3 +++ libreoffice-help-en-US.changes | 5 +++++ libreoffice-help-en-US.spec | 2 +- libreoffice-help-en-US.spec.in | 2 +- libreoffice-help-group1.changes | 5 +++++ libreoffice-help-group1.spec | 2 +- libreoffice-help-group2.changes | 5 +++++ libreoffice-help-group2.spec | 2 +- libreoffice-help-group3.changes | 5 +++++ libreoffice-help-group3.spec | 2 +- libreoffice-help-group4.changes | 5 +++++ libreoffice-help-group4.spec | 2 +- libreoffice-help-group5.changes | 5 +++++ libreoffice-help-group5.spec | 2 +- libreoffice-help-groupX.spec.in | 2 +- libreoffice-icon-themes.changes | 5 +++++ libreoffice-icon-themes.spec | 2 +- libreoffice-l10n.changes | 5 +++++ libreoffice-l10n.spec | 2 +- libreoffice-l10n.spec.in | 2 +- libreoffice-translations-3.5.4.6.tar.bz2 | 3 --- libreoffice-translations-3.5.4.7.tar.bz2 | 3 +++ libreoffice.changes | 14 ++++++++++++++ libreoffice.spec | 2 +- 31 files changed, 86 insertions(+), 27 deletions(-) delete mode 100644 libreoffice-binfilter-3.5.4.6.tar.bz2 create mode 100644 libreoffice-binfilter-3.5.4.7.tar.bz2 delete mode 100644 libreoffice-core-3.5.4.6.tar.bz2 create mode 100644 libreoffice-core-3.5.4.7.tar.bz2 delete mode 100644 libreoffice-help-3.5.4.6.tar.bz2 create mode 100644 libreoffice-help-3.5.4.7.tar.bz2 delete mode 100644 libreoffice-translations-3.5.4.6.tar.bz2 create mode 100644 libreoffice-translations-3.5.4.7.tar.bz2 diff --git a/libreoffice-binfilter-3.5.4.6.tar.bz2 b/libreoffice-binfilter-3.5.4.6.tar.bz2 deleted file mode 100644 index 44fcf7a..0000000 --- a/libreoffice-binfilter-3.5.4.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f6f66caded6d82cdd0beac7d8b81d0d71dbbbf4b4543378259557e1f9c64dcc -size 6451602 diff --git a/libreoffice-binfilter-3.5.4.7.tar.bz2 b/libreoffice-binfilter-3.5.4.7.tar.bz2 new file mode 100644 index 0000000..370c5ea --- /dev/null +++ b/libreoffice-binfilter-3.5.4.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b64af39594769bd424f5de753d6016109eaf160ff2305fb2814a25ad18c0469f +size 6452781 diff --git a/libreoffice-branding-upstream.changes b/libreoffice-branding-upstream.changes index ce1c60e..2a56fb7 100644 --- a/libreoffice-branding-upstream.changes +++ b/libreoffice-branding-upstream.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 9 17:06:28 UTC 2012 - pmladek@suse.com + +- updated to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) + ------------------------------------------------------------------- Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-branding-upstream.spec b/libreoffice-branding-upstream.spec index 6e3f215..6e8b9c1 100644 --- a/libreoffice-branding-upstream.spec +++ b/libreoffice-branding-upstream.spec @@ -17,10 +17,10 @@ Name: libreoffice-branding-upstream -Version: 3.5.4.6 +Version: 3.5.4.7 Release: 0 -%define lo_build_version 3.5.4.6 -%define lo_piece_version 3.5.4.6 +%define lo_build_version 3.5.4.7 +%define lo_piece_version 3.5.4.7 %define lo_sourcedirname libreoffice-build-%lo_piece_version %define lo_home libreoffice Summary: Original Branding for LibreOffice diff --git a/libreoffice-core-3.5.4.6.tar.bz2 b/libreoffice-core-3.5.4.6.tar.bz2 deleted file mode 100644 index faed543..0000000 --- a/libreoffice-core-3.5.4.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:789c185f563f983b7825c91b1149afa637ae207a35ad231b9d6039919ab32456 -size 128489280 diff --git a/libreoffice-core-3.5.4.7.tar.bz2 b/libreoffice-core-3.5.4.7.tar.bz2 new file mode 100644 index 0000000..006a7ee --- /dev/null +++ b/libreoffice-core-3.5.4.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1cac902e3f1fd24b0fb590f8acede7d5b34610bdefec52b9f3e00f97ff9cae67 +size 128344088 diff --git a/libreoffice-help-3.5.4.6.tar.bz2 b/libreoffice-help-3.5.4.6.tar.bz2 deleted file mode 100644 index 88b7047..0000000 --- a/libreoffice-help-3.5.4.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a1841558df25e89371cea2b78fa847979320b4b444539a8d7862ba45304a125 -size 1882190 diff --git a/libreoffice-help-3.5.4.7.tar.bz2 b/libreoffice-help-3.5.4.7.tar.bz2 new file mode 100644 index 0000000..c098129 --- /dev/null +++ b/libreoffice-help-3.5.4.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c44bc6b2fbfded9996765297a23902322990c0a7081d9fb8488bcf04de741eba +size 1881488 diff --git a/libreoffice-help-en-US.changes b/libreoffice-help-en-US.changes index 9d1c444..69d109a 100644 --- a/libreoffice-help-en-US.changes +++ b/libreoffice-help-en-US.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 9 17:06:28 UTC 2012 - pmladek@suse.com + +- updated to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) + ------------------------------------------------------------------- Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-en-US.spec b/libreoffice-help-en-US.spec index ef87e1a..7ccd9b2 100644 --- a/libreoffice-help-en-US.spec +++ b/libreoffice-help-en-US.spec @@ -22,7 +22,7 @@ Name: libreoffice-help-en-US ## Generated by: ## perl lo-help-gen-spec libreoffice-help-en-US.spec.in lo-help-en-US ################################################################### -Version: 3.5.4.6 +Version: 3.5.4.7 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-help-en-US.spec.in b/libreoffice-help-en-US.spec.in index c7efe72..3a22455 100644 --- a/libreoffice-help-en-US.spec.in +++ b/libreoffice-help-en-US.spec.in @@ -18,7 +18,7 @@ Name: libreoffice-help-en-US @DO_NOT_EDIT_COMMENT@ -Version: 3.5.4.6 +Version: 3.5.4.7 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-help-group1.changes b/libreoffice-help-group1.changes index c186b14..edd3353 100644 --- a/libreoffice-help-group1.changes +++ b/libreoffice-help-group1.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 9 17:06:28 UTC 2012 - pmladek@suse.com + +- updated to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) + ------------------------------------------------------------------- Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-group1.spec b/libreoffice-help-group1.spec index 0007c1d..ccda37f 100644 --- a/libreoffice-help-group1.spec +++ b/libreoffice-help-group1.spec @@ -22,7 +22,7 @@ Name: libreoffice-help-group1 ## Generated by: ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ################################################################### -Version: 3.5.4.6 +Version: 3.5.4.7 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-help-group2.changes b/libreoffice-help-group2.changes index 891bd24..db34cd6 100644 --- a/libreoffice-help-group2.changes +++ b/libreoffice-help-group2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 9 17:06:28 UTC 2012 - pmladek@suse.com + +- updated to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) + ------------------------------------------------------------------- Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-group2.spec b/libreoffice-help-group2.spec index 900dbe9..bb50738 100644 --- a/libreoffice-help-group2.spec +++ b/libreoffice-help-group2.spec @@ -22,7 +22,7 @@ Name: libreoffice-help-group2 ## Generated by: ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ################################################################### -Version: 3.5.4.6 +Version: 3.5.4.7 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-help-group3.changes b/libreoffice-help-group3.changes index b7a6f00..338451c 100644 --- a/libreoffice-help-group3.changes +++ b/libreoffice-help-group3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 9 17:06:28 UTC 2012 - pmladek@suse.com + +- updated to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) + ------------------------------------------------------------------- Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-group3.spec b/libreoffice-help-group3.spec index 290c179..9793a60 100644 --- a/libreoffice-help-group3.spec +++ b/libreoffice-help-group3.spec @@ -22,7 +22,7 @@ Name: libreoffice-help-group3 ## Generated by: ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ################################################################### -Version: 3.5.4.6 +Version: 3.5.4.7 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-help-group4.changes b/libreoffice-help-group4.changes index fbe83c3..c9ae888 100644 --- a/libreoffice-help-group4.changes +++ b/libreoffice-help-group4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 9 17:06:28 UTC 2012 - pmladek@suse.com + +- updated to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) + ------------------------------------------------------------------- Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-group4.spec b/libreoffice-help-group4.spec index 3fb3993..d4658fc 100644 --- a/libreoffice-help-group4.spec +++ b/libreoffice-help-group4.spec @@ -22,7 +22,7 @@ Name: libreoffice-help-group4 ## Generated by: ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ################################################################### -Version: 3.5.4.6 +Version: 3.5.4.7 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-help-group5.changes b/libreoffice-help-group5.changes index 891bd24..db34cd6 100644 --- a/libreoffice-help-group5.changes +++ b/libreoffice-help-group5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 9 17:06:28 UTC 2012 - pmladek@suse.com + +- updated to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) + ------------------------------------------------------------------- Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-group5.spec b/libreoffice-help-group5.spec index 06fc9a7..a2a07e0 100644 --- a/libreoffice-help-group5.spec +++ b/libreoffice-help-group5.spec @@ -22,7 +22,7 @@ Name: libreoffice-help-group5 ## Generated by: ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ################################################################### -Version: 3.5.4.6 +Version: 3.5.4.7 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-help-groupX.spec.in b/libreoffice-help-groupX.spec.in index bed4f05..b37823a 100644 --- a/libreoffice-help-groupX.spec.in +++ b/libreoffice-help-groupX.spec.in @@ -18,7 +18,7 @@ Name: libreoffice-help-group@GROUP_NUMBER@ @DO_NOT_EDIT_COMMENT@ -Version: 3.5.4.6 +Version: 3.5.4.7 Release: 0 %define gnu_make_version 3.82 %define gnu_make_snapshot 20120301 diff --git a/libreoffice-icon-themes.changes b/libreoffice-icon-themes.changes index ab0af14..5b87ae2 100644 --- a/libreoffice-icon-themes.changes +++ b/libreoffice-icon-themes.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 9 17:06:28 UTC 2012 - pmladek@suse.com + +- updated to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) + ------------------------------------------------------------------- Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-icon-themes.spec b/libreoffice-icon-themes.spec index 8937952..779b54a 100644 --- a/libreoffice-icon-themes.spec +++ b/libreoffice-icon-themes.spec @@ -17,7 +17,7 @@ Name: libreoffice-icon-themes -Version: 3.5.4.6 +Version: 3.5.4.7 Release: 0 %define ooo_home libreoffice BuildRequires: libreoffice-icon-themes-prebuilt = %version diff --git a/libreoffice-l10n.changes b/libreoffice-l10n.changes index d6523d5..226269f 100644 --- a/libreoffice-l10n.changes +++ b/libreoffice-l10n.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 9 17:06:28 UTC 2012 - pmladek@suse.com + +- updated to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) + ------------------------------------------------------------------- Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-l10n.spec b/libreoffice-l10n.spec index efe7a9d..d721e7f 100644 --- a/libreoffice-l10n.spec +++ b/libreoffice-l10n.spec @@ -22,7 +22,7 @@ ## perl lo-l10n-gen-spec libreoffice-l10n.spec.in lo-l10n-data ################################################################### Name: libreoffice-l10n -Version: 3.5.4.6 +Version: 3.5.4.7 Release: 0 %define piece l10n %define ooo_home libreoffice diff --git a/libreoffice-l10n.spec.in b/libreoffice-l10n.spec.in index 22b553f..7e7d8af 100644 --- a/libreoffice-l10n.spec.in +++ b/libreoffice-l10n.spec.in @@ -18,7 +18,7 @@ @DO_NOT_EDIT_COMMENT@ Name: libreoffice-l10n -Version: 3.5.4.6 +Version: 3.5.4.7 Release: 0 %define piece l10n %define ooo_home libreoffice diff --git a/libreoffice-translations-3.5.4.6.tar.bz2 b/libreoffice-translations-3.5.4.6.tar.bz2 deleted file mode 100644 index 670031d..0000000 --- a/libreoffice-translations-3.5.4.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:850a14c267ee992f33f5a22854b0448cddb7de0b45a9ebb72866f418dd8ed92f -size 140989774 diff --git a/libreoffice-translations-3.5.4.7.tar.bz2 b/libreoffice-translations-3.5.4.7.tar.bz2 new file mode 100644 index 0000000..b79540c --- /dev/null +++ b/libreoffice-translations-3.5.4.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f04eb50d18d8bb2d067e741558a2332e54c7ec616f6cef25aadb84d6949214a1 +size 140989544 diff --git a/libreoffice.changes b/libreoffice.changes index 282928f..efcdc46 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Jul 9 17:06:28 UTC 2012 - pmladek@suse.com + +- update to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) + * clip max entries + * XLSX import crasher (fdo#51601) + * double border import regression + * add SUSE black and white branding + * check for invalid tab number (fdo#51667) + * query for parameters in Base reports crasher (fdo#51619) + * fix MySQL, GDocs, and LanguageTool extension registration + * make sure we don't export shapes with negative size (bnc#760997) + * make sure all tab pages have the same dimensions (fdo#49921, bnc#769162) + ------------------------------------------------------------------- Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index b531192..c6fa4ef 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -213,7 +213,7 @@ BuildRequires: gst-plugins-base-devel # the manifest file must be in the right place; registration does not work with some repacked jars %define __jar_repack %{nil} %endif -Version: 3.5.4.6 +Version: 3.5.4.7 Release: 0 Requires: libreoffice-branding < 4 Requires: libreoffice-branding > 3.2.99.3 From 11c8a6f19062323cfa980f16d81b034693a6e040ffa709f3521ed9d6169b435f Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Wed, 11 Jul 2012 15:09:01 +0000 Subject: [PATCH 2/6] - reduce build parallelism to reduce build crashes: * dmake support 64 jobs at maximum * do not eat all memory with some huge sources - add procps into BuildRequires to check available memory OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=6 --- libreoffice-help-en-US.changes | 6 +++- libreoffice-help-en-US.spec | 51 +++++++++++++++++++++++---------- libreoffice-help-en-US.spec.in | 51 +++++++++++++++++++++++---------- libreoffice-help-group1.changes | 6 +++- libreoffice-help-group1.spec | 51 +++++++++++++++++++++++---------- libreoffice-help-group2.changes | 6 +++- libreoffice-help-group2.spec | 51 +++++++++++++++++++++++---------- libreoffice-help-group3.changes | 6 +++- libreoffice-help-group3.spec | 51 +++++++++++++++++++++++---------- libreoffice-help-group4.changes | 6 +++- libreoffice-help-group4.spec | 51 +++++++++++++++++++++++---------- libreoffice-help-group5.changes | 6 +++- libreoffice-help-group5.spec | 51 +++++++++++++++++++++++---------- libreoffice-help-groupX.spec.in | 51 +++++++++++++++++++++++---------- libreoffice-icon-themes.changes | 2 +- libreoffice-l10n.changes | 2 +- libreoffice.changes | 4 +++ libreoffice.spec | 45 ++++++++++++++++++++--------- 18 files changed, 356 insertions(+), 141 deletions(-) diff --git a/libreoffice-help-en-US.changes b/libreoffice-help-en-US.changes index 69d109a..9ef076c 100644 --- a/libreoffice-help-en-US.changes +++ b/libreoffice-help-en-US.changes @@ -1,7 +1,11 @@ ------------------------------------------------------------------- Mon Jul 9 17:06:28 UTC 2012 - pmladek@suse.com -- updated to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) +- update to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) +- reduce build parallelism to reduce build crashes: + * dmake support 64 jobs at maximum + * do not eat all memory with some huge sources +- add procps into BuildRequires to check available memory ------------------------------------------------------------------- Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-en-US.spec b/libreoffice-help-en-US.spec index 7ccd9b2..cfd42e4 100644 --- a/libreoffice-help-en-US.spec +++ b/libreoffice-help-en-US.spec @@ -63,6 +63,7 @@ BuildRequires: openssl-devel BuildRequires: perl-Archive-Zip BuildRequires: perl-Compress-Zlib BuildRequires: pkg-config +BuildRequires: procps BuildRequires: unzip BuildRequires: xorg-x11-devel BuildRequires: zip @@ -182,24 +183,44 @@ cd - PARALLEL_BUILD= BUILD_SCRIPT_FLAGS= ncpus= -# parallel build of modules; it makes sense on machines with more CPUs -if test "%build_module_in_parallel" = "1" ; then - ncpus=`grep ^processor /proc/cpuinfo | wc -l` - PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor /proc/cpuinfo | wc -l`" +# +# Parallel build settings ... +BUILD_SCRIPT_FLAGS= +# dmake does not work with more than 64 jobs +lo_jobs="%{?jobs:%jobs}" +if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then + echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" + lo_jobs="64" fi -if test "%build_module_in_parallel" -gt "1" ; then - ncpus=%build_module_in_parallel - PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel" +# do not eat all memory +lo_jobs_reduced= +if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then + if test `uname -i` = "x86_64" ; then + mem_per_process=300 + else + mem_per_process=200 + fi + max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` + max_jobs="$(($max_mem / $mem_per_process))" + test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" + test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits" fi -if test -n "$ncpus" ; then - PARALLEL_BUILD="--with-num-cpus=$ncpus" - BUILD_SCRIPT_FLAGS="-P$ncpus" +# finally set jobs +PARALLEL_BUILD= +if test -n "$lo_jobs" ; then + PARALLEL_BUILD="--with-max-jobs=$lo_jobs" + BUILD_SCRIPT_FLAGS="-- -P%jobs" fi -if test -n "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then - PARALLEL_BUILD="$PARALLEL_BUILD - --with-gcc-speedup=icecream - --with-max-jobs=%jobs" - BUILD_SCRIPT_FLAGS="$BUILD_SCRIPT_FLAGS -- -P%jobs" +# parallel build of modules +# it makes sense on machines with more CPUs +num_cpus=`grep ^processor /proc/cpuinfo | wc -l` +# allow only 2 modules if there more jobs allowed in one module +test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" +PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" +BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +# using icecream +if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then + PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" fi %endif # make sure that JAVA_HOME is set correctly diff --git a/libreoffice-help-en-US.spec.in b/libreoffice-help-en-US.spec.in index 3a22455..debe078 100644 --- a/libreoffice-help-en-US.spec.in +++ b/libreoffice-help-en-US.spec.in @@ -59,6 +59,7 @@ BuildRequires: openssl-devel BuildRequires: perl-Archive-Zip BuildRequires: perl-Compress-Zlib BuildRequires: pkg-config +BuildRequires: procps BuildRequires: unzip BuildRequires: xorg-x11-devel BuildRequires: zip @@ -178,24 +179,44 @@ cd - PARALLEL_BUILD= BUILD_SCRIPT_FLAGS= ncpus= -# parallel build of modules; it makes sense on machines with more CPUs -if test "%build_module_in_parallel" = "1" ; then - ncpus=`grep ^processor /proc/cpuinfo | wc -l` - PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor /proc/cpuinfo | wc -l`" +# +# Parallel build settings ... +BUILD_SCRIPT_FLAGS= +# dmake does not work with more than 64 jobs +lo_jobs="%{?jobs:%jobs}" +if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then + echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" + lo_jobs="64" fi -if test "%build_module_in_parallel" -gt "1" ; then - ncpus=%build_module_in_parallel - PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel" +# do not eat all memory +lo_jobs_reduced= +if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then + if test `uname -i` = "x86_64" ; then + mem_per_process=300 + else + mem_per_process=200 + fi + max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` + max_jobs="$(($max_mem / $mem_per_process))" + test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" + test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits" fi -if test -n "$ncpus" ; then - PARALLEL_BUILD="--with-num-cpus=$ncpus" - BUILD_SCRIPT_FLAGS="-P$ncpus" +# finally set jobs +PARALLEL_BUILD= +if test -n "$lo_jobs" ; then + PARALLEL_BUILD="--with-max-jobs=$lo_jobs" + BUILD_SCRIPT_FLAGS="-- -P%jobs" fi -if test -n "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then - PARALLEL_BUILD="$PARALLEL_BUILD - --with-gcc-speedup=icecream - --with-max-jobs=%jobs" - BUILD_SCRIPT_FLAGS="$BUILD_SCRIPT_FLAGS -- -P%jobs" +# parallel build of modules +# it makes sense on machines with more CPUs +num_cpus=`grep ^processor /proc/cpuinfo | wc -l` +# allow only 2 modules if there more jobs allowed in one module +test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" +PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" +BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +# using icecream +if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then + PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" fi %endif # make sure that JAVA_HOME is set correctly diff --git a/libreoffice-help-group1.changes b/libreoffice-help-group1.changes index edd3353..ae8e553 100644 --- a/libreoffice-help-group1.changes +++ b/libreoffice-help-group1.changes @@ -1,7 +1,11 @@ ------------------------------------------------------------------- Mon Jul 9 17:06:28 UTC 2012 - pmladek@suse.com -- updated to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) +- update to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) +- reduce build parallelism to reduce build crashes: + * dmake support 64 jobs at maximum + * do not eat all memory with some huge sources +- add procps into BuildRequires to check available memory ------------------------------------------------------------------- Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-group1.spec b/libreoffice-help-group1.spec index ccda37f..239f55d 100644 --- a/libreoffice-help-group1.spec +++ b/libreoffice-help-group1.spec @@ -75,6 +75,7 @@ BuildRequires: openssl-devel BuildRequires: perl-Archive-Zip BuildRequires: perl-Compress-Zlib BuildRequires: pkg-config +BuildRequires: procps BuildRequires: python-devel BuildRequires: unzip BuildRequires: xorg-x11-devel @@ -277,24 +278,44 @@ cd zip30 make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc cd - %endif -# parallel build of modules; it makes sense on machines with more CPUs -if test "%build_module_in_parallel" = "1" ; then - ncpus=`grep ^processor /proc/cpuinfo | wc -l` - PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor /proc/cpuinfo | wc -l`" +# +# Parallel build settings ... +BUILD_SCRIPT_FLAGS= +# dmake does not work with more than 64 jobs +lo_jobs="%{?jobs:%jobs}" +if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then + echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" + lo_jobs="64" fi -if test "%build_module_in_parallel" -gt "1" ; then - ncpus=%build_module_in_parallel - PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel" +# do not eat all memory +lo_jobs_reduced= +if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then + if test `uname -i` = "x86_64" ; then + mem_per_process=300 + else + mem_per_process=200 + fi + max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` + max_jobs="$(($max_mem / $mem_per_process))" + test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" + test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits" fi -if test -n "$ncpus" ; then - PARALLEL_BUILD="--with-num-cpus=$ncpus" - BUILD_SCRIPT_FLAGS="-P$ncpus" +# finally set jobs +PARALLEL_BUILD= +if test -n "$lo_jobs" ; then + PARALLEL_BUILD="--with-max-jobs=$lo_jobs" + BUILD_SCRIPT_FLAGS="-- -P%jobs" fi -if test -n "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then - PARALLEL_BUILD="$PARALLEL_BUILD - --with-gcc-speedup=icecream - --with-max-jobs=%jobs" - BUILD_SCRIPT_FLAGS="$BUILD_SCRIPT_FLAGS -- -P%jobs" +# parallel build of modules +# it makes sense on machines with more CPUs +num_cpus=`grep ^processor /proc/cpuinfo | wc -l` +# allow only 2 modules if there more jobs allowed in one module +test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" +PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" +BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +# using icecream +if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then + PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" fi %endif # make sure that JAVA_HOME is set correctly diff --git a/libreoffice-help-group2.changes b/libreoffice-help-group2.changes index db34cd6..5fcfe8b 100644 --- a/libreoffice-help-group2.changes +++ b/libreoffice-help-group2.changes @@ -1,7 +1,11 @@ ------------------------------------------------------------------- Mon Jul 9 17:06:28 UTC 2012 - pmladek@suse.com -- updated to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) +- update to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) +- reduce build parallelism to reduce build crashes: + * dmake support 64 jobs at maximum + * do not eat all memory with some huge sources +- add procps into BuildRequires to check available memory ------------------------------------------------------------------- Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-group2.spec b/libreoffice-help-group2.spec index bb50738..fe845b5 100644 --- a/libreoffice-help-group2.spec +++ b/libreoffice-help-group2.spec @@ -75,6 +75,7 @@ BuildRequires: openssl-devel BuildRequires: perl-Archive-Zip BuildRequires: perl-Compress-Zlib BuildRequires: pkg-config +BuildRequires: procps BuildRequires: python-devel BuildRequires: unzip BuildRequires: xorg-x11-devel @@ -295,24 +296,44 @@ cd zip30 make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc cd - %endif -# parallel build of modules; it makes sense on machines with more CPUs -if test "%build_module_in_parallel" = "1" ; then - ncpus=`grep ^processor /proc/cpuinfo | wc -l` - PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor /proc/cpuinfo | wc -l`" +# +# Parallel build settings ... +BUILD_SCRIPT_FLAGS= +# dmake does not work with more than 64 jobs +lo_jobs="%{?jobs:%jobs}" +if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then + echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" + lo_jobs="64" fi -if test "%build_module_in_parallel" -gt "1" ; then - ncpus=%build_module_in_parallel - PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel" +# do not eat all memory +lo_jobs_reduced= +if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then + if test `uname -i` = "x86_64" ; then + mem_per_process=300 + else + mem_per_process=200 + fi + max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` + max_jobs="$(($max_mem / $mem_per_process))" + test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" + test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits" fi -if test -n "$ncpus" ; then - PARALLEL_BUILD="--with-num-cpus=$ncpus" - BUILD_SCRIPT_FLAGS="-P$ncpus" +# finally set jobs +PARALLEL_BUILD= +if test -n "$lo_jobs" ; then + PARALLEL_BUILD="--with-max-jobs=$lo_jobs" + BUILD_SCRIPT_FLAGS="-- -P%jobs" fi -if test -n "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then - PARALLEL_BUILD="$PARALLEL_BUILD - --with-gcc-speedup=icecream - --with-max-jobs=%jobs" - BUILD_SCRIPT_FLAGS="$BUILD_SCRIPT_FLAGS -- -P%jobs" +# parallel build of modules +# it makes sense on machines with more CPUs +num_cpus=`grep ^processor /proc/cpuinfo | wc -l` +# allow only 2 modules if there more jobs allowed in one module +test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" +PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" +BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +# using icecream +if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then + PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" fi %endif # make sure that JAVA_HOME is set correctly diff --git a/libreoffice-help-group3.changes b/libreoffice-help-group3.changes index 338451c..fe59bec 100644 --- a/libreoffice-help-group3.changes +++ b/libreoffice-help-group3.changes @@ -1,7 +1,11 @@ ------------------------------------------------------------------- Mon Jul 9 17:06:28 UTC 2012 - pmladek@suse.com -- updated to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) +- update to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) +- reduce build parallelism to reduce build crashes: + * dmake support 64 jobs at maximum + * do not eat all memory with some huge sources +- add procps into BuildRequires to check available memory ------------------------------------------------------------------- Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-group3.spec b/libreoffice-help-group3.spec index 9793a60..bcac587 100644 --- a/libreoffice-help-group3.spec +++ b/libreoffice-help-group3.spec @@ -75,6 +75,7 @@ BuildRequires: openssl-devel BuildRequires: perl-Archive-Zip BuildRequires: perl-Compress-Zlib BuildRequires: pkg-config +BuildRequires: procps BuildRequires: python-devel BuildRequires: unzip BuildRequires: xorg-x11-devel @@ -334,24 +335,44 @@ cd zip30 make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc cd - %endif -# parallel build of modules; it makes sense on machines with more CPUs -if test "%build_module_in_parallel" = "1" ; then - ncpus=`grep ^processor /proc/cpuinfo | wc -l` - PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor /proc/cpuinfo | wc -l`" +# +# Parallel build settings ... +BUILD_SCRIPT_FLAGS= +# dmake does not work with more than 64 jobs +lo_jobs="%{?jobs:%jobs}" +if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then + echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" + lo_jobs="64" fi -if test "%build_module_in_parallel" -gt "1" ; then - ncpus=%build_module_in_parallel - PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel" +# do not eat all memory +lo_jobs_reduced= +if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then + if test `uname -i` = "x86_64" ; then + mem_per_process=300 + else + mem_per_process=200 + fi + max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` + max_jobs="$(($max_mem / $mem_per_process))" + test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" + test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits" fi -if test -n "$ncpus" ; then - PARALLEL_BUILD="--with-num-cpus=$ncpus" - BUILD_SCRIPT_FLAGS="-P$ncpus" +# finally set jobs +PARALLEL_BUILD= +if test -n "$lo_jobs" ; then + PARALLEL_BUILD="--with-max-jobs=$lo_jobs" + BUILD_SCRIPT_FLAGS="-- -P%jobs" fi -if test -n "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then - PARALLEL_BUILD="$PARALLEL_BUILD - --with-gcc-speedup=icecream - --with-max-jobs=%jobs" - BUILD_SCRIPT_FLAGS="$BUILD_SCRIPT_FLAGS -- -P%jobs" +# parallel build of modules +# it makes sense on machines with more CPUs +num_cpus=`grep ^processor /proc/cpuinfo | wc -l` +# allow only 2 modules if there more jobs allowed in one module +test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" +PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" +BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +# using icecream +if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then + PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" fi %endif # make sure that JAVA_HOME is set correctly diff --git a/libreoffice-help-group4.changes b/libreoffice-help-group4.changes index c9ae888..14218ce 100644 --- a/libreoffice-help-group4.changes +++ b/libreoffice-help-group4.changes @@ -1,7 +1,11 @@ ------------------------------------------------------------------- Mon Jul 9 17:06:28 UTC 2012 - pmladek@suse.com -- updated to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) +- update to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) +- reduce build parallelism to reduce build crashes: + * dmake support 64 jobs at maximum + * do not eat all memory with some huge sources +- add procps into BuildRequires to check available memory ------------------------------------------------------------------- Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-group4.spec b/libreoffice-help-group4.spec index d4658fc..57d2292 100644 --- a/libreoffice-help-group4.spec +++ b/libreoffice-help-group4.spec @@ -75,6 +75,7 @@ BuildRequires: openssl-devel BuildRequires: perl-Archive-Zip BuildRequires: perl-Compress-Zlib BuildRequires: pkg-config +BuildRequires: procps BuildRequires: python-devel BuildRequires: unzip BuildRequires: xorg-x11-devel @@ -268,24 +269,44 @@ cd zip30 make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc cd - %endif -# parallel build of modules; it makes sense on machines with more CPUs -if test "%build_module_in_parallel" = "1" ; then - ncpus=`grep ^processor /proc/cpuinfo | wc -l` - PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor /proc/cpuinfo | wc -l`" +# +# Parallel build settings ... +BUILD_SCRIPT_FLAGS= +# dmake does not work with more than 64 jobs +lo_jobs="%{?jobs:%jobs}" +if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then + echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" + lo_jobs="64" fi -if test "%build_module_in_parallel" -gt "1" ; then - ncpus=%build_module_in_parallel - PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel" +# do not eat all memory +lo_jobs_reduced= +if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then + if test `uname -i` = "x86_64" ; then + mem_per_process=300 + else + mem_per_process=200 + fi + max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` + max_jobs="$(($max_mem / $mem_per_process))" + test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" + test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits" fi -if test -n "$ncpus" ; then - PARALLEL_BUILD="--with-num-cpus=$ncpus" - BUILD_SCRIPT_FLAGS="-P$ncpus" +# finally set jobs +PARALLEL_BUILD= +if test -n "$lo_jobs" ; then + PARALLEL_BUILD="--with-max-jobs=$lo_jobs" + BUILD_SCRIPT_FLAGS="-- -P%jobs" fi -if test -n "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then - PARALLEL_BUILD="$PARALLEL_BUILD - --with-gcc-speedup=icecream - --with-max-jobs=%jobs" - BUILD_SCRIPT_FLAGS="$BUILD_SCRIPT_FLAGS -- -P%jobs" +# parallel build of modules +# it makes sense on machines with more CPUs +num_cpus=`grep ^processor /proc/cpuinfo | wc -l` +# allow only 2 modules if there more jobs allowed in one module +test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" +PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" +BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +# using icecream +if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then + PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" fi %endif # make sure that JAVA_HOME is set correctly diff --git a/libreoffice-help-group5.changes b/libreoffice-help-group5.changes index db34cd6..5fcfe8b 100644 --- a/libreoffice-help-group5.changes +++ b/libreoffice-help-group5.changes @@ -1,7 +1,11 @@ ------------------------------------------------------------------- Mon Jul 9 17:06:28 UTC 2012 - pmladek@suse.com -- updated to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) +- update to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) +- reduce build parallelism to reduce build crashes: + * dmake support 64 jobs at maximum + * do not eat all memory with some huge sources +- add procps into BuildRequires to check available memory ------------------------------------------------------------------- Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-help-group5.spec b/libreoffice-help-group5.spec index a2a07e0..7d6d4a7 100644 --- a/libreoffice-help-group5.spec +++ b/libreoffice-help-group5.spec @@ -75,6 +75,7 @@ BuildRequires: openssl-devel BuildRequires: perl-Archive-Zip BuildRequires: perl-Compress-Zlib BuildRequires: pkg-config +BuildRequires: procps BuildRequires: python-devel BuildRequires: unzip BuildRequires: xorg-x11-devel @@ -322,24 +323,44 @@ cd zip30 make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc cd - %endif -# parallel build of modules; it makes sense on machines with more CPUs -if test "%build_module_in_parallel" = "1" ; then - ncpus=`grep ^processor /proc/cpuinfo | wc -l` - PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor /proc/cpuinfo | wc -l`" +# +# Parallel build settings ... +BUILD_SCRIPT_FLAGS= +# dmake does not work with more than 64 jobs +lo_jobs="%{?jobs:%jobs}" +if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then + echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" + lo_jobs="64" fi -if test "%build_module_in_parallel" -gt "1" ; then - ncpus=%build_module_in_parallel - PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel" +# do not eat all memory +lo_jobs_reduced= +if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then + if test `uname -i` = "x86_64" ; then + mem_per_process=300 + else + mem_per_process=200 + fi + max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` + max_jobs="$(($max_mem / $mem_per_process))" + test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" + test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits" fi -if test -n "$ncpus" ; then - PARALLEL_BUILD="--with-num-cpus=$ncpus" - BUILD_SCRIPT_FLAGS="-P$ncpus" +# finally set jobs +PARALLEL_BUILD= +if test -n "$lo_jobs" ; then + PARALLEL_BUILD="--with-max-jobs=$lo_jobs" + BUILD_SCRIPT_FLAGS="-- -P%jobs" fi -if test -n "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then - PARALLEL_BUILD="$PARALLEL_BUILD - --with-gcc-speedup=icecream - --with-max-jobs=%jobs" - BUILD_SCRIPT_FLAGS="$BUILD_SCRIPT_FLAGS -- -P%jobs" +# parallel build of modules +# it makes sense on machines with more CPUs +num_cpus=`grep ^processor /proc/cpuinfo | wc -l` +# allow only 2 modules if there more jobs allowed in one module +test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" +PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" +BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +# using icecream +if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then + PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" fi %endif # make sure that JAVA_HOME is set correctly diff --git a/libreoffice-help-groupX.spec.in b/libreoffice-help-groupX.spec.in index b37823a..62937d1 100644 --- a/libreoffice-help-groupX.spec.in +++ b/libreoffice-help-groupX.spec.in @@ -71,6 +71,7 @@ BuildRequires: openssl-devel BuildRequires: perl-Archive-Zip BuildRequires: perl-Compress-Zlib BuildRequires: pkg-config +BuildRequires: procps BuildRequires: python-devel BuildRequires: unzip BuildRequires: xorg-x11-devel @@ -154,24 +155,44 @@ cd zip30 make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc cd - %endif -# parallel build of modules; it makes sense on machines with more CPUs -if test "%build_module_in_parallel" = "1" ; then - ncpus=`grep ^processor /proc/cpuinfo | wc -l` - PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor /proc/cpuinfo | wc -l`" +# +# Parallel build settings ... +BUILD_SCRIPT_FLAGS= +# dmake does not work with more than 64 jobs +lo_jobs="%{?jobs:%jobs}" +if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then + echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" + lo_jobs="64" fi -if test "%build_module_in_parallel" -gt "1" ; then - ncpus=%build_module_in_parallel - PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel" +# do not eat all memory +lo_jobs_reduced= +if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then + if test `uname -i` = "x86_64" ; then + mem_per_process=300 + else + mem_per_process=200 + fi + max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` + max_jobs="$(($max_mem / $mem_per_process))" + test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" + test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits" fi -if test -n "$ncpus" ; then - PARALLEL_BUILD="--with-num-cpus=$ncpus" - BUILD_SCRIPT_FLAGS="-P$ncpus" +# finally set jobs +PARALLEL_BUILD= +if test -n "$lo_jobs" ; then + PARALLEL_BUILD="--with-max-jobs=$lo_jobs" + BUILD_SCRIPT_FLAGS="-- -P%jobs" fi -if test -n "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then - PARALLEL_BUILD="$PARALLEL_BUILD - --with-gcc-speedup=icecream - --with-max-jobs=%jobs" - BUILD_SCRIPT_FLAGS="$BUILD_SCRIPT_FLAGS -- -P%jobs" +# parallel build of modules +# it makes sense on machines with more CPUs +num_cpus=`grep ^processor /proc/cpuinfo | wc -l` +# allow only 2 modules if there more jobs allowed in one module +test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" +PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" +BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +# using icecream +if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then + PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" fi %endif # make sure that JAVA_HOME is set correctly diff --git a/libreoffice-icon-themes.changes b/libreoffice-icon-themes.changes index 5b87ae2..71b7ef4 100644 --- a/libreoffice-icon-themes.changes +++ b/libreoffice-icon-themes.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Mon Jul 9 17:06:28 UTC 2012 - pmladek@suse.com -- updated to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) +- update to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) ------------------------------------------------------------------- Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com diff --git a/libreoffice-l10n.changes b/libreoffice-l10n.changes index 226269f..eb14bfc 100644 --- a/libreoffice-l10n.changes +++ b/libreoffice-l10n.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Mon Jul 9 17:06:28 UTC 2012 - pmladek@suse.com -- updated to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) +- update to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) ------------------------------------------------------------------- Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com diff --git a/libreoffice.changes b/libreoffice.changes index efcdc46..79c6bc9 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -11,6 +11,10 @@ Mon Jul 9 17:06:28 UTC 2012 - pmladek@suse.com * fix MySQL, GDocs, and LanguageTool extension registration * make sure we don't export shapes with negative size (bnc#760997) * make sure all tab pages have the same dimensions (fdo#49921, bnc#769162) +- reduce build parallelism to reduce build crashes: + * dmake support 64 jobs at maximum + * do not eat all memory with some huge sources +- add procps into BuildRequires to check available memory ------------------------------------------------------------------- Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index c6fa4ef..25d3427 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -47,6 +47,7 @@ BuildRequires: patch BuildRequires: perl-Archive-Zip BuildRequires: perl-Compress-Zlib BuildRequires: postgresql-devel +BuildRequires: procps BuildRequires: python-devel BuildRequires: recode BuildRequires: unixODBC-devel @@ -163,10 +164,6 @@ BuildRequires: gst-plugins-base-devel # test_build_SDK: 0 = no # 1 = yes (if possible, see below the definition of lo_build_sdk) %define test_build_sdk 1 -# build_module_in_parallel 0 = no -# 1 = yes (the number is defined be the number of cpus) -# 2,3,4... = yes (force the number of modules to be built in parallel) -%define build_module_in_parallel 1 # debug_build: 0 = no # 1 = yes (enable depency tracking, ccache) %define debug_build 0 @@ -1388,17 +1385,39 @@ cd - %endif # # Parallel build settings ... +# dmake does not work with more than 64 jobs +lo_jobs="%{?jobs:%jobs}" +if test -n "$lo_jobs" -a "$lo_jobs" -gt "64" ; then + echo "Warning: dmake does not support more than 64 processes => reducing number of parallel jobs" + lo_jobs="64" +fi +# do not eat all memory +lo_jobs_reduced= +if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then + if test `uname -i` = "x86_64" ; then + mem_per_process=300 + else + mem_per_process=200 + fi + max_mem=`LANG=C free -t -m | sed -n "s|^Total: *\([0-9]*\).*$|\1|p"` + max_jobs="$(($max_mem / $mem_per_process))" + test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" + test "$lo_jobs" -le 0 && lo_jobs= && echo "Warning: Do not use the parallel build at all becuse of memory limits" +fi +# finally set jobs PARALLEL_BUILD= -if test -n "%{?jobs:%jobs}" -a -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then - PARALLEL_BUILD="--with-gcc-speedup=icecream - --with-max-jobs=%jobs" +if test -n "$lo_jobs" ; then + PARALLEL_BUILD="--with-max-jobs=$lo_jobs" fi -# parallel build of modules; it makes sense on machines with more CPUs -if test "%build_module_in_parallel" = "1" ; then - PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=`grep ^processor /proc/cpuinfo | wc -l`" -fi -if test "%build_module_in_parallel" -gt "1" ; then - PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=%build_module_in_parallel" +# parallel build of modules +# it makes sense on machines with more CPUs +num_cpus=`grep ^processor /proc/cpuinfo | wc -l` +# allow only 2 modules if there more jobs allowed in one module +test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" +PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" +# using icecream +if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then + PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" fi # # disable KDE4 on openSUSE-11.1-Evergreen but not on SLED11 From 979140cada02e14ceb156aa2076b148a1498e26098447688bd20feaa7d7eb5f0 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Wed, 11 Jul 2012 15:15:55 +0000 Subject: [PATCH 3/6] typo OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=7 --- libreoffice-branding-upstream.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice-branding-upstream.changes b/libreoffice-branding-upstream.changes index 2a56fb7..8137429 100644 --- a/libreoffice-branding-upstream.changes +++ b/libreoffice-branding-upstream.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Mon Jul 9 17:06:28 UTC 2012 - pmladek@suse.com -- updated to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) +- update to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) ------------------------------------------------------------------- Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com From 5ec8fed7c4564bbd05a22e8a906c415d9c4d16facec29f7d3fca1b65dd67ae9c Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Wed, 11 Jul 2012 15:44:35 +0000 Subject: [PATCH 4/6] typo OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=8 --- libreoffice-help-en-US.spec | 4 ++-- libreoffice-help-en-US.spec.in | 4 ++-- libreoffice-help-group1.spec | 4 ++-- libreoffice-help-group2.spec | 4 ++-- libreoffice-help-group3.spec | 4 ++-- libreoffice-help-group4.spec | 4 ++-- libreoffice-help-group5.spec | 4 ++-- libreoffice-help-groupX.spec.in | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/libreoffice-help-en-US.spec b/libreoffice-help-en-US.spec index cfd42e4..f65f7bd 100644 --- a/libreoffice-help-en-US.spec +++ b/libreoffice-help-en-US.spec @@ -209,7 +209,7 @@ fi PARALLEL_BUILD= if test -n "$lo_jobs" ; then PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P%jobs" + BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" fi # parallel build of modules # it makes sense on machines with more CPUs @@ -217,7 +217,7 @@ num_cpus=`grep ^processor /proc/cpuinfo | wc -l` # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" # using icecream if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" diff --git a/libreoffice-help-en-US.spec.in b/libreoffice-help-en-US.spec.in index debe078..49dd243 100644 --- a/libreoffice-help-en-US.spec.in +++ b/libreoffice-help-en-US.spec.in @@ -205,7 +205,7 @@ fi PARALLEL_BUILD= if test -n "$lo_jobs" ; then PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P%jobs" + BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" fi # parallel build of modules # it makes sense on machines with more CPUs @@ -213,7 +213,7 @@ num_cpus=`grep ^processor /proc/cpuinfo | wc -l` # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" # using icecream if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" diff --git a/libreoffice-help-group1.spec b/libreoffice-help-group1.spec index 239f55d..1a9e687 100644 --- a/libreoffice-help-group1.spec +++ b/libreoffice-help-group1.spec @@ -304,7 +304,7 @@ fi PARALLEL_BUILD= if test -n "$lo_jobs" ; then PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P%jobs" + BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" fi # parallel build of modules # it makes sense on machines with more CPUs @@ -312,7 +312,7 @@ num_cpus=`grep ^processor /proc/cpuinfo | wc -l` # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" # using icecream if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" diff --git a/libreoffice-help-group2.spec b/libreoffice-help-group2.spec index fe845b5..7e14455 100644 --- a/libreoffice-help-group2.spec +++ b/libreoffice-help-group2.spec @@ -322,7 +322,7 @@ fi PARALLEL_BUILD= if test -n "$lo_jobs" ; then PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P%jobs" + BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" fi # parallel build of modules # it makes sense on machines with more CPUs @@ -330,7 +330,7 @@ num_cpus=`grep ^processor /proc/cpuinfo | wc -l` # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" # using icecream if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" diff --git a/libreoffice-help-group3.spec b/libreoffice-help-group3.spec index bcac587..c431240 100644 --- a/libreoffice-help-group3.spec +++ b/libreoffice-help-group3.spec @@ -361,7 +361,7 @@ fi PARALLEL_BUILD= if test -n "$lo_jobs" ; then PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P%jobs" + BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" fi # parallel build of modules # it makes sense on machines with more CPUs @@ -369,7 +369,7 @@ num_cpus=`grep ^processor /proc/cpuinfo | wc -l` # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" # using icecream if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" diff --git a/libreoffice-help-group4.spec b/libreoffice-help-group4.spec index 57d2292..1ed3b14 100644 --- a/libreoffice-help-group4.spec +++ b/libreoffice-help-group4.spec @@ -295,7 +295,7 @@ fi PARALLEL_BUILD= if test -n "$lo_jobs" ; then PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P%jobs" + BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" fi # parallel build of modules # it makes sense on machines with more CPUs @@ -303,7 +303,7 @@ num_cpus=`grep ^processor /proc/cpuinfo | wc -l` # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" # using icecream if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" diff --git a/libreoffice-help-group5.spec b/libreoffice-help-group5.spec index 7d6d4a7..2e87778 100644 --- a/libreoffice-help-group5.spec +++ b/libreoffice-help-group5.spec @@ -349,7 +349,7 @@ fi PARALLEL_BUILD= if test -n "$lo_jobs" ; then PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P%jobs" + BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" fi # parallel build of modules # it makes sense on machines with more CPUs @@ -357,7 +357,7 @@ num_cpus=`grep ^processor /proc/cpuinfo | wc -l` # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" # using icecream if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" diff --git a/libreoffice-help-groupX.spec.in b/libreoffice-help-groupX.spec.in index 62937d1..d705428 100644 --- a/libreoffice-help-groupX.spec.in +++ b/libreoffice-help-groupX.spec.in @@ -181,7 +181,7 @@ fi PARALLEL_BUILD= if test -n "$lo_jobs" ; then PARALLEL_BUILD="--with-max-jobs=$lo_jobs" - BUILD_SCRIPT_FLAGS="-- -P%jobs" + BUILD_SCRIPT_FLAGS="-- -P$lo_jobs" fi # parallel build of modules # it makes sense on machines with more CPUs @@ -189,7 +189,7 @@ num_cpus=`grep ^processor /proc/cpuinfo | wc -l` # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" -BUILD_SCRIPT_FLAGS="-P$ncpus $BUILD_SCRIPT_FLAGS" +BUILD_SCRIPT_FLAGS="-P$num_cpus $BUILD_SCRIPT_FLAGS" # using icecream if test -e "/opt/icecream/bin/gcc" -a -e "/opt/icecream/bin/g++" ; then PARALLEL_BUILD="$PARALLEL_BUILD --with-gcc-speedup=icecream" From 516e6367e7fc6ebb4d70dfc83728666aa25d922257611e8f97389363e5ca81c4 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Thu, 12 Jul 2012 03:57:54 +0000 Subject: [PATCH 5/6] even more reduce paralilism OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=9 --- libreoffice-help-en-US.spec | 2 ++ libreoffice-help-en-US.spec.in | 2 ++ libreoffice-help-group1.spec | 2 ++ libreoffice-help-group2.spec | 2 ++ libreoffice-help-group3.spec | 2 ++ libreoffice-help-group4.spec | 2 ++ libreoffice-help-group5.spec | 2 ++ libreoffice-help-groupX.spec.in | 2 ++ libreoffice.spec | 2 ++ 9 files changed, 18 insertions(+) diff --git a/libreoffice-help-en-US.spec b/libreoffice-help-en-US.spec index f65f7bd..0716f7b 100644 --- a/libreoffice-help-en-US.spec +++ b/libreoffice-help-en-US.spec @@ -214,6 +214,8 @@ fi # parallel build of modules # it makes sense on machines with more CPUs num_cpus=`grep ^processor /proc/cpuinfo | wc -l` +# again reduce to 64 CPUs because of dmake +test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus" # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" diff --git a/libreoffice-help-en-US.spec.in b/libreoffice-help-en-US.spec.in index 49dd243..2a48af0 100644 --- a/libreoffice-help-en-US.spec.in +++ b/libreoffice-help-en-US.spec.in @@ -210,6 +210,8 @@ fi # parallel build of modules # it makes sense on machines with more CPUs num_cpus=`grep ^processor /proc/cpuinfo | wc -l` +# again reduce to 64 CPUs because of dmake +test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus" # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" diff --git a/libreoffice-help-group1.spec b/libreoffice-help-group1.spec index 1a9e687..aa303e8 100644 --- a/libreoffice-help-group1.spec +++ b/libreoffice-help-group1.spec @@ -309,6 +309,8 @@ fi # parallel build of modules # it makes sense on machines with more CPUs num_cpus=`grep ^processor /proc/cpuinfo | wc -l` +# again reduce to 64 CPUs because of dmake +test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus" # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" diff --git a/libreoffice-help-group2.spec b/libreoffice-help-group2.spec index 7e14455..89676ca 100644 --- a/libreoffice-help-group2.spec +++ b/libreoffice-help-group2.spec @@ -327,6 +327,8 @@ fi # parallel build of modules # it makes sense on machines with more CPUs num_cpus=`grep ^processor /proc/cpuinfo | wc -l` +# again reduce to 64 CPUs because of dmake +test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus" # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" diff --git a/libreoffice-help-group3.spec b/libreoffice-help-group3.spec index c431240..e6db23c 100644 --- a/libreoffice-help-group3.spec +++ b/libreoffice-help-group3.spec @@ -366,6 +366,8 @@ fi # parallel build of modules # it makes sense on machines with more CPUs num_cpus=`grep ^processor /proc/cpuinfo | wc -l` +# again reduce to 64 CPUs because of dmake +test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus" # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" diff --git a/libreoffice-help-group4.spec b/libreoffice-help-group4.spec index 1ed3b14..d748e04 100644 --- a/libreoffice-help-group4.spec +++ b/libreoffice-help-group4.spec @@ -300,6 +300,8 @@ fi # parallel build of modules # it makes sense on machines with more CPUs num_cpus=`grep ^processor /proc/cpuinfo | wc -l` +# again reduce to 64 CPUs because of dmake +test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus" # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" diff --git a/libreoffice-help-group5.spec b/libreoffice-help-group5.spec index 2e87778..167b971 100644 --- a/libreoffice-help-group5.spec +++ b/libreoffice-help-group5.spec @@ -354,6 +354,8 @@ fi # parallel build of modules # it makes sense on machines with more CPUs num_cpus=`grep ^processor /proc/cpuinfo | wc -l` +# again reduce to 64 CPUs because of dmake +test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus" # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" diff --git a/libreoffice-help-groupX.spec.in b/libreoffice-help-groupX.spec.in index d705428..b57f772 100644 --- a/libreoffice-help-groupX.spec.in +++ b/libreoffice-help-groupX.spec.in @@ -186,6 +186,8 @@ fi # parallel build of modules # it makes sense on machines with more CPUs num_cpus=`grep ^processor /proc/cpuinfo | wc -l` +# again reduce to 64 CPUs because of dmake +test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus" # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" diff --git a/libreoffice.spec b/libreoffice.spec index 25d3427..a573a63 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1412,6 +1412,8 @@ fi # parallel build of modules # it makes sense on machines with more CPUs num_cpus=`grep ^processor /proc/cpuinfo | wc -l` +# again reduce to 64 CPUs because of dmake +test "$num_cpus" -gt "64" && num_cpus="64" && echo "Warning: dmake does not support more than 64 processes => reducing number of used cpus" # allow only 2 modules if there more jobs allowed in one module test -n "$lo_jobs" -a "$lo_jobs" -gt 1 && num_cpus="2" PARALLEL_BUILD="$PARALLEL_BUILD --with-num-cpus=$num_cpus" From 0a920eb0c802f7e996b550480958648fcd43f9d1464e191769d67368c226679d Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Fri, 13 Jul 2012 10:40:24 +0000 Subject: [PATCH 6/6] - used the internal mysql cppconnector even for openSUSE-12.3; it did not build with the system one OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=10 --- libreoffice.changes | 6 ++++++ libreoffice.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libreoffice.changes b/libreoffice.changes index 79c6bc9..58add0f 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 13 10:37:51 UTC 2012 - pmladek@suse.com + +- used the internal mysql cppconnector even for openSUSE-12.3; + it did not build with the system one + ------------------------------------------------------------------- Mon Jul 9 17:06:28 UTC 2012 - pmladek@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index a573a63..f9a3918 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -103,7 +103,7 @@ BuildRequires: cppunit-devel %if 0%{?suse_version} BuildRequires: libmysqlclient-devel %endif -%if 0%{?suse_version} > 01220 +%if 0%{?suse_version} > 01230 # mysqlcppconn >= 1.0.6 is needed BuildRequires: libmysqlcppconn-devel %endif