rpm/boost
SHA256
1
0
Fork 0
forked from pool/boost
Code Pull Requests Activity

- move mpi.so to the devel package to avoid conflicts on update

Browse Source 
- 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
This commit is contained in:
Stephan Kulow 2014-02-27 06:18:46 +00:00 committed by Git OBS Bridge
parent 662225c6d4
commit 26c2e0d56c
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
boost.changes
View File

@ -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 Sat Feb 8 18:06:12 CET 2014 - pth@suse.de

11
boost.spec
View File

@ -453,6 +453,11 @@ if test -z "$JOBS"; then
else else
test 1 -gt "$JOBS" && JOBS=1 test 1 -gt "$JOBS" && JOBS=1
fi 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 if test "$JOBS" = 0; then
JOBS=1 JOBS=1
fi fi
@ -514,7 +519,7 @@ EOF
%{_bindir}/bjam ${BJAM_CONFIG} ${LONG_DOUBLE_FLAGS} ${LIBRARIES_FLAGS} \ %{_bindir}/bjam ${BJAM_CONFIG} ${LONG_DOUBLE_FLAGS} ${LIBRARIES_FLAGS} \
--user-config=user-config.jam \ --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) (echo "Not all Boost libraries built properly."; exit 1)
%if %build_docs %if %build_docs
@ -688,7 +693,6 @@ rm -f %{buildroot}%{_libdir}/*.a
%files -n libboost_mpi%{lib_appendix} %files -n libboost_mpi%{lib_appendix}
%defattr(-, root, root, -) %defattr(-, root, root, -)
%{_libdir}/libboost_mpi*.so.* %{_libdir}/libboost_mpi*.so.*
%{_libdir}/mpi.so
%endif %endif
%files -n libboost_test%{lib_appendix} %files -n libboost_test%{lib_appendix}
@ -748,9 +752,6 @@ rm -f %{buildroot}%{_libdir}/*.a
%defattr(-, root, root, -) %defattr(-, root, root, -)
%{_includedir}/boost %{_includedir}/boost
%{_libdir}/*.so %{_libdir}/*.so
%if %build_mpi
%exclude %{_libdir}/mpi.so
%endif
#%%{_datadir}/aclocal/*.m4 #%%{_datadir}/aclocal/*.m4
%files doc-html %files doc-html