Accepting request 493683 from devel:libraries:c_c++
1 OBS-URL: https://build.opensuse.org/request/show/493683 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boost?expand=0&rev=116
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
b92920659c
19
1d862615.patch
Normal file
19
1d862615.patch
Normal file
@ -0,0 +1,19 @@
|
||||
commit 1d86261581230e2dc5d617a9b16287d326f3e229
|
||||
Author: Robert Ramey <ramey@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>
|
||||
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue May 9 10:52:38 UTC 2017 - adam.majer@suse.de
|
||||
|
||||
- 1d862615.patch: Fix regression caused by refactoring of
|
||||
serialization code (bnc#1038083)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 8 11:31:17 UTC 2017 - adam.majer@suse.de
|
||||
|
||||
- make python-numpy optional build dependency
|
||||
- fix building of mpi python3 plugin
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 20 13:52:20 EST 2017 - adam.majer@suse.de
|
||||
|
||||
|
||||
38
boost.spec
38
boost.spec
@ -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 @@ Patch18: dynamic_linking.patch
|
||||
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: libbz2-devel
|
||||
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 @@ Conflicts: boost-devel < 1.63
|
||||
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 @@ Conflicts: boost-devel < 1.63
|
||||
%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 @@ Conflicts: boost-devel < 1.63
|
||||
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 @@ Conflicts: boost-devel < 1.63
|
||||
%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 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {}
|
||||
%patch19 -p1
|
||||
%patch20 -p1
|
||||
%patch21 -p1
|
||||
%patch22 -p2
|
||||
%patch100 -p1
|
||||
|
||||
#stupid build machinery copies .orig files
|
||||
@ -1130,7 +1148,9 @@ EOF
|
||||
%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 @@ install -m 0644 %{SOURCE11} %{buildroot}%{py_sitedir}/boost
|
||||
|
||||
%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 @@ rm -r %{buildroot}%{_includedir}/boost/context
|
||||
|
||||
%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 @@ rm -r %{buildroot}%{_includedir}/boost/context
|
||||
|
||||
%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 @@ rm -r %{buildroot}%{_includedir}/boost/context
|
||||
%{_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 @@ rm -r %{buildroot}%{_includedir}/boost/context
|
||||
%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 @@ rm -r %{buildroot}%{_includedir}/boost/context
|
||||
%{_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 @@ rm -r %{buildroot}%{_includedir}/boost/context
|
||||
%defattr(-, root, root, -)
|
||||
%{_libdir}/libboost_numpy-py3.so
|
||||
|
||||
%endif # with numpy
|
||||
%endif # with python3
|
||||
|
||||
%files -n libboost_serialization%{lib_appendix}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user