Accepting request 224413 from devel:libraries:c_c++

- remove broken python module mpi.so
- 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/request/show/224413
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boost?expand=0&rev=88

boost.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Feb 27 06:13:01 UTC 2014 - coolo@suse.com
+
+- remove broken python module mpi.so
+- 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
 

boost.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package boost
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -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
@@ -534,6 +539,10 @@ cd doc
 	--includedir=%{buildroot}%{_includedir} \
 	install || echo "Not all Boost libraries built properly."
 
+# do not install the python module - as long as noone needs it, it requires more fixes
+# see https://bugzilla.redhat.com/show_bug.cgi?id=801534 for details
+rm %{buildroot}%{_libdir}/mpi.so
+
 mkdir -p %{buildroot}%{_docdir}
 
 pushd %{buildroot}%{_libdir}
@@ -688,7 +697,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 +756,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