From 26c2e0d56ca11b0ea57292eaca11960895989a2857cff0a8e42bca53235eed0b Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Thu, 27 Feb 2014 06:18:46 +0000
Subject: [PATCH] - move mpi.so to the devel package to avoid conflicts on
 update - trying to make the build more reliable:   * use -fno-var-tracking in
 cxxflags as recommended by richi   * disable parallel build on low memory

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=120
---
 boost.changes |  8 ++++++++
 boost.spec    | 11 ++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/boost.changes b/boost.changes
index d5ed06a..931c145 100644
--- a/boost.changes
+++ b/boost.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Feb 27 06:13:01 UTC 2014 - coolo@suse.com
+
+- move mpi.so to the devel package to avoid conflicts on update
+- trying to make the build more reliable: 
+  * use -fno-var-tracking in cxxflags as recommended by richi
+  * disable parallel build on low memory
+
 -------------------------------------------------------------------
 Sat Feb  8 18:06:12 CET 2014 - pth@suse.de
 
diff --git a/boost.spec b/boost.spec
index 6199808..617fc12 100644
--- a/boost.spec
+++ b/boost.spec
@@ -453,6 +453,11 @@ if test -z "$JOBS"; then
 else
   test 1 -gt "$JOBS" && JOBS=1
 fi
+Mem=$(grep MemTotal /proc/meminfo | awk '{print $2}')
+# require 4G for parallel build
+if test "$Mem" -lt 4000000; then
+  JOBS=1
+fi
 if test "$JOBS" = 0; then
   JOBS=1
 fi
@@ -514,7 +519,7 @@ EOF
 
 %{_bindir}/bjam ${BJAM_CONFIG} ${LONG_DOUBLE_FLAGS} ${LIBRARIES_FLAGS} \
 	--user-config=user-config.jam \
-	cflags="%{optflags}" cxxflags="%{optflags}" stage || \
+	cflags="%{optflags}" cxxflags="%{optflags} -fno-var-tracking" stage || \
 	(echo "Not all Boost libraries built properly."; exit 1)
 
 %if %build_docs
@@ -688,7 +693,6 @@ rm -f %{buildroot}%{_libdir}/*.a
 %files -n libboost_mpi%{lib_appendix}
 %defattr(-, root, root, -)
 %{_libdir}/libboost_mpi*.so.*
-%{_libdir}/mpi.so
 %endif
 
 %files -n libboost_test%{lib_appendix}
@@ -748,9 +752,6 @@ rm -f %{buildroot}%{_libdir}/*.a
 %defattr(-, root, root, -)
 %{_includedir}/boost
 %{_libdir}/*.so
-%if %build_mpi
-%exclude %{_libdir}/mpi.so
-%endif
 #%%{_datadir}/aclocal/*.m4
 
 %files doc-html