- 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
This commit is contained in:
parent
662225c6d4
commit
26c2e0d56c
@ -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
|
||||
|
||||
|
11
boost.spec
11
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
|
||||
|
Loading…
Reference in New Issue
Block a user