From efb221eab7d21769fae1b7ff29d37051b3d2ff86553bc3dc27841e41973ecc1e Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Tue, 22 Jul 2014 13:41:57 +0000 Subject: [PATCH 1/3] Accepting request 241888 from home:fcrozat:branches:devel:libraries:c_c++ - use only JOBS=2 to avoid gcc being killed with OOM when memory is between 4G and 7G. OBS-URL: https://build.opensuse.org/request/show/241888 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=131 --- boost.changes | 6 ++++++ boost.spec | 3 +++ 2 files changed, 9 insertions(+) diff --git a/boost.changes b/boost.changes index 6c398d2..9869547 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 22 12:22:13 UTC 2014 - fcrozat@suse.com + +- use only JOBS=2 to avoid gcc being killed with OOM when memory is + between 4G and 7G. + ------------------------------------------------------------------- Tue Apr 29 14:34:41 UTC 2014 - dvaleev@suse.com diff --git a/boost.spec b/boost.spec index a61850b..19b4181 100644 --- a/boost.spec +++ b/boost.spec @@ -466,6 +466,9 @@ Mem=$(grep MemTotal /proc/meminfo | awk '{print $2}') # require 4G for parallel build if test "$Mem" -lt 4000000; then JOBS=1 +elif test "$Mem" -lt 7000000; then +# lower number of jobs if memory is less than 7G but more than 4G + JOBS=2 fi if test "$JOBS" = 0; then JOBS=1 From b819a2ff3fe6d2bc9f53362c6266ee0c0e31f033972738b3794424980d0e8071 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Tue, 22 Jul 2014 19:54:25 +0000 Subject: [PATCH 2/3] Accepting request 241900 from home:fcrozat:branches:devel:libraries:c_c++ - Ensure there is enough disk space available for build. OBS-URL: https://build.opensuse.org/request/show/241900 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=132 --- _constraints | 3 +++ boost.changes | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/_constraints b/_constraints index 3fa17cc..1f52539 100644 --- a/_constraints +++ b/_constraints @@ -4,6 +4,9 @@ 2000 + + 5 + kvm SLOW_CPU diff --git a/boost.changes b/boost.changes index 9869547..28a1ff4 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 22 13:52:26 UTC 2014 - fcrozat@suse.com + +- Ensure there is enough disk space available for build. + ------------------------------------------------------------------- Tue Jul 22 12:22:13 UTC 2014 - fcrozat@suse.com From b3d6540489da58482d07b7e058a525411feafd30a9dd44a9ec5b2cfa693dcef5 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 30 Jul 2014 05:09:41 +0000 Subject: [PATCH 3/3] - add baselibs.conf as source OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=133 --- boost.changes | 5 +++++ boost.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/boost.changes b/boost.changes index 28a1ff4..29c3425 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 30 05:09:29 UTC 2014 - coolo@suse.com + +- add baselibs.conf as source + ------------------------------------------------------------------- Tue Jul 22 13:52:26 UTC 2014 - fcrozat@suse.com diff --git a/boost.spec b/boost.spec index 19b4181..d6e6c9e 100644 --- a/boost.spec +++ b/boost.spec @@ -102,6 +102,7 @@ Source2: %{name}_%{short_version}_man.tar.bz2 Source3: http://downloads.sourceforge.net/project/boost/boost-docs/%{version}/%{name}_%{file_version}_pdf.tar.bz2 Source4: existing_extra_docs #Source5: NEWS +Source100: baselibs.conf Patch1: boost-thread.patch Patch2: boost-no_type_punning.patch Patch8: boost-no_segfault_in_Regex_filter.patch