Hello community,
here is the log from the commit of package boost for openSUSE:Factory checked
in at 2017-05-16 14:30:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/boost (Old)
and /work/SRC/openSUSE:Factory/.boost.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "boost"
Tue May 16 14:30:32 2017 rev:116 rq:493683 version:1.64.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/boost/boost.changes 2017-04-30
21:09:44.976384320 +0200
+++ /work/SRC/openSUSE:Factory/.boost.new/boost.changes 2017-05-16
14:30:33.890123751 +0200
@@ -1,0 +2,12 @@
+Tue May 9 10:52:38 UTC 2017 - adam.ma...@suse.de
+
+- 1d862615.patch: Fix regression caused by refactoring of
+ serialization code (bnc#1038083)
+
+-------------------------------------------------------------------
+Mon May 8 11:31:17 UTC 2017 - adam.ma...@suse.de
+
+- make python-numpy optional build dependency
+- fix building of mpi python3 plugin
+
+-------------------------------------------------------------------
New:
----
1d862615.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ boost.spec ++++++
--- /var/tmp/diff_new_pack.HHnEPp/_old 2017-05-16 14:30:36.821711912 +0200
+++ /var/tmp/diff_new_pack.HHnEPp/_new 2017-05-16 14:30:36.829710788 +0200
@@ -39,6 +39,14 @@
%bcond_without python3
%endif
+# Python NumPy library is only available on Leap 42.1 OpenSUSE onward
+# and is not availble in SLE
+%if 0%{?suse_version} >= 1330 || 0%{?is_opensuse}
+%bcond_without python_numpy
+%else
+%bcond_with python_numpy
+%endif
+
# context hasn't been ported to most architectures yet
%ifarch %ix86 x86_64 %arm aarch64 mips ppc ppc64 ppc64le
%bcond_without build_context
@@ -95,6 +103,7 @@
Patch19: mpi_upstream.patch
Patch20: python_library_name.patch
Patch21: python_numpy_retfunc.patch
+Patch22: 1d862615.patch
Patch100: gcc_path.patch
BuildRequires: chrpath
BuildRequires: dos2unix
@@ -112,11 +121,15 @@
BuildRequires: libexpat-devel
BuildRequires: libicu-devel
BuildRequires: python-devel
+%if %{with python_numpy}
BuildRequires: python-numpy-devel
+%endif
%if %{with python3}
BuildRequires: python3-devel
+%if %{with python_numpy}
BuildRequires: python3-numpy-devel
-%endif
+%endif # numpy
+%endif # python3
#!BuildIgnore: python
BuildRequires: zlib-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -712,6 +725,7 @@
Development headers for Boost::Python library for the default version of
python.
+%if %{with python_numpy}
%package -n libboost_numpy-py2_7-%{lib_appendix}
Summary: Boost.Python.NumPy runtime library
Group: System/Libraries
@@ -733,6 +747,7 @@
%description -n libboost_numpy-py2_7-%{lib_appendix}-devel
Development headers for Boost::Python::NumPy library for the default version of
python.
+%endif
%if %{with python3}
%package -n libboost_python-py3-%{lib_appendix}
@@ -757,6 +772,7 @@
Development headers for Boost.Python library. This package contains
library for python3 development for boost.
+%if %{with python_numpy}
%package -n libboost_numpy-py3-%{lib_appendix}
Summary: Boost.Python.NumPy runtime library
Group: System/Libraries
@@ -778,6 +794,7 @@
%description -n libboost_numpy-py3-%{lib_appendix}-devel
Development headers for Boost.Python.NumPy library. This package contains
library for python3 development for boost.
+%endif # with numpy
%endif # with python3
@@ -1045,6 +1062,7 @@
%patch19 -p1
%patch20 -p1
%patch21 -p1
+%patch22 -p2
%patch100 -p1
#stupid build machinery copies .orig files
@@ -1130,7 +1148,9 @@
%if %{with python3}
cp user-config.jam user-config-py3.jam
# sed -i -e 's#//boost_python#//boost_python3#' ./user-config-py3.jam
-%{?!py3_abiflags:%define py3_abiflags m}
+%{?!py3_abiflags: %define py3_abiflags m}
+%{?!python3_version: %define python3_version %py3_ver }
+
cat << EOF >> user-config-py3.jam
using python
: %{python3_version}
@@ -1267,7 +1287,7 @@
%if %{with python3}
mkdir -p %{buildroot}%{python3_sitearch}/boost/parallel/mpi/
-mv %{buildroot}/%{_libdir}/mpi.%{py3_soflags}.so
%{buildroot}%{python3_sitearch}/boost/parallel/mpi/
+mv %{buildroot}/%{_libdir}/mpi.*so
%{buildroot}%{python3_sitearch}/boost/parallel/mpi/mpi.%{py3_soflags}.so
install -m 0644 libs/mpi/build/__init__.py
%{buildroot}%{python3_sitearch}/boost/parallel/mpi/
install -m 0644 %{SOURCE11} %{buildroot}%{python3_sitearch}/boost/parallel
install -m 0644 %{SOURCE11} %{buildroot}%{python3_sitearch}/boost
@@ -1349,13 +1369,17 @@
%post -n libboost_python-py2_7-%{lib_appendix} -p /sbin/ldconfig
+%if %{with python_numpy}
%post -n libboost_numpy-py2_7-%{lib_appendix} -p /sbin/ldconfig
+%endif
%if %{with python3}
%post -n libboost_python-py3-%{lib_appendix} -p /sbin/ldconfig
+%if %{with python_numpy}
%post -n libboost_numpy-py3-%{lib_appendix} -p /sbin/ldconfig
%endif
+%endif
%post -n libboost_regex%{lib_appendix} -p /sbin/ldconfig
@@ -1418,13 +1442,17 @@
%postun -n libboost_python-py2_7-%{lib_appendix} -p /sbin/ldconfig
+%if %{with python_numpy}
%postun -n libboost_numpy-py2_7-%{lib_appendix} -p /sbin/ldconfig
+%endif
%if %{with python3}
%postun -n libboost_python-py3-%{lib_appendix} -p /sbin/ldconfig
+%if %{with python_numpy}
%postun -n libboost_numpy-py3-%{lib_appendix} -p /sbin/ldconfig
%endif
+%endif
%postun -n libboost_regex%{lib_appendix} -p /sbin/ldconfig
@@ -1668,6 +1696,7 @@
%{_libdir}/libboost_python.so
%{_libdir}/libboost_python-py2_7.so
+%if %{with python_numpy}
%files -n libboost_numpy-py2_7-%{lib_appendix}
%defattr(-, root, root, -)
%{_libdir}/libboost_numpy-py2_7.so.%{version}
@@ -1675,6 +1704,7 @@
%files -n libboost_numpy-py2_7-%{lib_appendix}-devel
%defattr(-, root, root, -)
%{_libdir}/libboost_numpy-py2_7.so
+%endif
%if %{with python3}
%files -n libboost_python-py3-%{lib_appendix}
@@ -1686,6 +1716,7 @@
%{_libdir}/libboost_python3.so
%{_libdir}/libboost_python-py3.so
+%if %{with python_numpy}
%files -n libboost_numpy-py3-%{lib_appendix}
%defattr(-, root, root, -)
%{_libdir}/libboost_numpy-py3.so.%{version}
@@ -1694,6 +1725,7 @@
%defattr(-, root, root, -)
%{_libdir}/libboost_numpy-py3.so
+%endif # with numpy
%endif # with python3
%files -n libboost_serialization%{lib_appendix}
++++++ 1d862615.patch ++++++
commit 1d86261581230e2dc5d617a9b16287d326f3e229
Author: Robert Ramey <ra...@rrsd.com>
Date: Wed Feb 1 16:43:59 2017 -0800
correct error which appeared when compiling non c++ compliant code for
arrays
diff --git a/include/boost/serialization/array.hpp
b/include/boost/serialization/array.hpp
index 61708b3..612d1a6 100644
--- a/include/boost/serialization/array.hpp
+++ b/include/boost/serialization/array.hpp
@@ -23,6 +23,8 @@ namespace std{
} // namespace std
#endif
+#include <boost/serialization/array_wrapper.hpp>
+
#ifndef BOOST_NO_CXX11_HDR_ARRAY
#include <array>
