- remove python 2.7, it is 2020 after all

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=255
This commit is contained in:
2020-08-17 18:59:27 +00:00
committed by Git OBS Bridge
parent 7bb1f11753
commit 103ee14371
3 changed files with 4 additions and 239 deletions

View File

@@ -14,7 +14,6 @@ libboost_mpi1_74_0
libboost_nowide1_74_0
libboost_test1_74_0
libboost_program_options1_74_0
libboost_python-py2_7-1_74_0
libboost_python-py3-1_74_0
libboost_random1_74_0
libboost_serialization1_74_0

View File

@@ -10,6 +10,7 @@ Mon Aug 17 17:23:18 UTC 2020 - Dirk Mueller <dmueller@suse.com>
- remove boost-visibility.patch,
boost-no_segfault_in_Regex_filter.patch (obsolete, will never go upstream)
- add boost-remove-cmakedir.patch (remove buildroot embedding in cmake files)
- remove python 2.7, it is 2020 after all
-------------------------------------------------------------------
Thu Mar 12 10:18:33 UTC 2020 - Adam Majer <adam.majer@suse.de>

View File

@@ -33,10 +33,6 @@
%define package_name boost%{library_version}
%define my_docdir %{_docdir}/boost%{library_version}
%if 0%{?suse_version} < 1500
%define python2_sitearch %{python_sitearch}
%endif
# We can't have these inside the "@BUILD_FLAVOR@" because then quilt
# can't understand the spec file. If only @BUILD_FLAVOR@ was a normal macro....
%define build_base 1
@@ -57,7 +53,6 @@ ExclusiveArch: do_not_build
%define build_base 0
%define name_suffix -extra
%bcond_without python3
%bcond_without python2
%ifarch ia64 hppa
%bcond_with mpi
%else
@@ -85,7 +80,6 @@ ExcludeArch: s390x %{ix86} ppc64 ppc64le
%undefine c_f_ver
%bcond_without hpc
%bcond_without mpi
%bcond_without python2
%bcond_without python3
%if %{with ringdisabled}
ExclusiveArch: do-not-build
@@ -103,7 +97,6 @@ ExcludeArch: s390x %{ix86} ppc64 ppc64le ia64 hppa
%undefine c_f_ver
%bcond_without hpc
%bcond_without mpi
%bcond_without python2
%bcond_without python3
%if %{with ringdisabled}
ExclusiveArch: do-not-build
@@ -120,7 +113,6 @@ ExcludeArch: s390x %{ix86} ppc64 ppc64le ia64 hppa
%undefine c_f_ver
%bcond_without hpc
%bcond_without mpi
%bcond_without python2
%bcond_without python3
%if %{with ringdisabled}
ExclusiveArch: do-not-build
@@ -137,7 +129,6 @@ ExcludeArch: s390x %{ix86} ppc64 ppc64le ia64 hppa
%undefine c_f_ver
%bcond_without hpc
%bcond_without mpi
%bcond_without python2
%bcond_without python3
%if %{with ringdisabled}
ExclusiveArch: do-not-build
@@ -168,7 +159,6 @@ ExcludeArch: s390x %{ix86} ppc64 ppc64le ia64 hppa
%define package_includedir %{hpc_includedir}
%define base_name %{hpc_package_name %_ver}
%define package_name %{hpc_package_name %_ver}
%define package_python2_sitearch %hpc_python_sitearch
%define package_python3_sitearch %{_hpc_python_sysconfig_path /usr/bin/python3 platlib %{?hpc_prefix}}
%else
%define package_prefix %{_prefix}
@@ -176,7 +166,6 @@ ExcludeArch: s390x %{ix86} ppc64 ppc64le ia64 hppa
%define package_libdir %{_libdir}
%define package_includedir %{_includedir}
%define base_name boost%{name_suffix}
%define package_python2_sitearch %python2_sitearch
%define package_python3_sitearch %python3_sitearch
%endif
@@ -232,16 +221,6 @@ BuildRequires: gcc-c++
%endif
%if ! %{build_base}
BuildRequires: dos2unix
%if %{with python2}
BuildRequires: python2-devel
%if %{with python_numpy}
%if 0%{?suse_version} >= 1500
BuildRequires: python2-numpy-devel
%else
BuildRequires: python-numpy-devel
%endif
%endif
%endif
%if %{with python3}
BuildRequires: python3-devel
%if %{with python_numpy}
@@ -348,9 +327,6 @@ Requires: libboost_fiber%{library_version}-devel
Requires: libboost_graph_parallel%{library_version}-devel
Requires: libboost_mpi%{library_version}-devel
%endif
%if %{with python2}
Requires: libboost_python-py2_7-%{library_version}-devel
%endif
%if %{with python3}
Requires: libboost_python-py3-%{library_version}-devel
%endif
@@ -369,16 +345,6 @@ Requires: %{package_name}
%description -n %{package_name}-python3
This package contains the Boost.MPI Python 3.x serialization
inteface.
%package -n %{package_name}-python2
Summary: Boost.MPI Python 2.x serialization library
Group: System/Libraries
Requires: %{package_name}
%description -n %{package_name}-python2
This package contains the Boost.MPI Python 2.x serialization
inteface.
%endif
%package -n boost%{library_version}-jam
@@ -729,9 +695,6 @@ Requires: libboost_serialization%{library_version}-devel
Conflicts: boost-devel < 1.63
Conflicts: libboost_mpi-devel-impl
Provides: libboost_mpi-devel-impl = %{version}
%if %{with python2}
Requires: libboost_python-py2_7-%{library_version}-devel
%endif
%if %{with python3}
Requires: libboost_python-py3-%{library_version}-devel
%endif
@@ -760,28 +723,6 @@ Provides: libboost_graph_parallel-devel-impl = %{version}
%description -n libboost_graph_parallel%{library_version}-devel
Development headers for Boost.Graph parallel boost library.
%package -n libboost_mpi_python-py2_7-%{library_version}
Summary: Boost.MPI Python serialization library
Group: System/Libraries
Requires: boost-license%{library_version}
%description -n libboost_mpi_python-py2_7-%{library_version}
This package contains the Boost.MPI Python 2.7 serialization library
%package -n libboost_mpi_python-py2_7-%{library_version}-devel
Summary: Development library for Boost.MPI Python 2.7 serialization
Group: Development/Libraries/C and C++
Requires: libboost_mpi%{library_version}-devel = %{version}
Requires: libboost_mpi_python-py2_7-%{library_version} = %{version}
Requires: libboost_python-py2_7-%{library_version} = %{version}
Conflicts: boost-devel < 1.63
Conflicts: libboost_mpi_python-devel-impl
Provides: libboost_mpi_python-devel-impl = %{version}
%description -n libboost_mpi_python-py2_7-%{library_version}-devel
This package contains the Boost.MPI development library for Python 2.7
serialization interface.
%package -n libboost_nowide%{library_version}
Summary: Boost.Nowide runtime libraries
Group: System/Libraries
@@ -797,16 +738,6 @@ Group: Development/Libraries/C and C++
%description -n libboost_nowide%{library_version}-devel
Development headers for Boost.Nowide* boost libraries.
%package -n python2-boost_parallel_mpi%{library_version}
Summary: Python 2.7 bindings for Boost.Parallel.MPI library
Group: Development/Languages/Python
Conflicts: python-boost_parallel_mpi-impl
Provides: python-boost_parallel_mpi%{library_version} = %{version}
Provides: python-boost_parallel_mpi-impl = %{version}
%description -n python2-boost_parallel_mpi%{library_version}
This package contains the Boost.Parallel.MPI bindings for Python 2.7
%package -n libboost_mpi_python-py3-%{library_version}
Summary: Boost.MPI Python 3.x serialization library
Group: System/Libraries
@@ -882,50 +813,6 @@ Provides: libboost_program_options-devel-impl = %{version}
This package contains development headers for Boost.ProgramOptions
library.
%package -n libboost_python-py2_7-%{library_version}
Summary: Boost.Python runtime library
Group: System/Libraries
Requires: boost-license%{library_version}
%description -n libboost_python-py2_7-%{library_version}
This package contains the Boost::Python runtime library for default
version of python.
%package -n libboost_python-py2_7-%{library_version}-devel
Summary: Development headers for Boost.Python library
Group: Development/Libraries/C and C++
Requires: libboost_headers%{library_version}-devel = %{version}
Requires: libboost_python-py2_7-%{library_version} = %{version}
Conflicts: boost-devel < 1.63
Conflicts: libboost_python-devel-impl
Provides: libboost_python-devel-impl = %{version}
%description -n libboost_python-py2_7-%{library_version}-devel
Development headers for Boost::Python library for the default version of
python.
%package -n libboost_numpy-py2_7-%{library_version}
Summary: Boost.Python.NumPy runtime library
Group: System/Libraries
Requires: boost-license%{library_version}
%description -n libboost_numpy-py2_7-%{library_version}
This package contains the Boost::Python::NumPy runtime library for default
version of python.
%package -n libboost_numpy-py2_7-%{library_version}-devel
Summary: Development headers for Boost.Python.NumPy library
Group: Development/Libraries/C and C++
Requires: libboost_headers%{library_version}-devel = %{version}
Requires: libboost_numpy-py2_7-%{library_version} = %{version}
Conflicts: boost-devel < 1.63
Conflicts: libboost_numpy-devel-impl
Provides: libboost_numpy-devel-impl = %{version}
%description -n libboost_numpy-py2_7-%{library_version}-devel
Development headers for Boost::Python::NumPy library for the default version of
python.
%package -n libboost_python-py3-%{library_version}
Summary: Boost.Python runtime library
Group: System/Libraries
@@ -1223,9 +1110,6 @@ tasks.
%if %{with hpc}
%{hpc_master_package}
%{hpc_master_package devel}
%if %{with python2}
%{hpc_master_package python2}
%endif
%if %{with python3}
%{hpc_master_package python3}
%endif
@@ -1332,9 +1216,9 @@ cp user-config.jam user-config-py.jam
cat << EOF >> user-config-py.jam
using python
: %{py_ver}
: %{_bindir}/python2
: %{_includedir}/python%{py_ver}
: %{_libdir}/python%{py_ver}
: %{_bindir}/python3
: %{_includedir}/python%{py3_ver}
: %{_libdir}/python%{py3_ver}
:
:
;
@@ -1343,15 +1227,6 @@ using mpi ;
%endif
EOF
%if %{with python2}
./b2 -d+2 -q --user-config=./user-config-py.jam \
--build-type=minimal --build-dir=./python-build \
--python-buildid=py2.7 \
--stagedir=./python-stage %{?_smp_mflags} \
$PY_LIBRARIES_FLAGS \
threading=multi link=shared runtime-link=shared stage
%endif
# Build boost python3 and MPI, installed in python3 staging
%if %{with python3}
cp user-config.jam user-config-py3.jam
@@ -1415,16 +1290,6 @@ echo 'using mpi ;' >> ./user-config.jam
# Can't be too careful!
cp %{SOURCE101} .
chmod +x symbol_diff.sh
%if %{with python3}
#./symbol_diff.sh python3-stage/lib/libboost_mpi.so stage/lib/libboost_mpi.so
#./symbol_diff.sh python3-stage/lib/libboost_serialization.so stage/lib/libboost_serialization.so
%endif
%if %{with python2}
#./symbol_diff.sh python-stage/lib/libboost_serialization.so stage/lib/libboost_serialization.so
#./symbol_diff.sh python-stage/lib/libboost_mpi.so stage/lib/libboost_mpi.so
%endif
#./symbol_diff.sh python-stage/lib/libboost_serialization.so stage/lib/libboost_serialization.so
#./symbol_diff.sh python-stage/lib/libboost_mpi.so stage/lib/libboost_mpi.so
# Build documentation
%if ! %{with hpc}
@@ -1469,17 +1334,6 @@ module load gnu %mpi_flavor
threading=multi link=shared runtime-link=shared install
%endif
%if %{with python2}
./b2 -d+2 -q --user-config=./user-config-py.jam \
--build-type=minimal --build-dir=./python-build \
--python-buildid=py2.7 \
--prefix=%{buildroot}%{package_prefix} --exec-prefix=%{buildroot}%{package_bindir} \
--libdir=%{buildroot}%{package_libdir} --includedir=%{buildroot}%{package_includedir} \
--stagedir=./python-stage %{?_smp_mflags} \
$PY_LIBRARIES_FLAGS \
threading=multi link=shared runtime-link=shared install
%endif
%endif
# Generic install
@@ -1496,27 +1350,12 @@ module load gnu %mpi_flavor
! $(ldd %{buildroot}%{package_libdir}/*.so* | grep python\\.)
%if ! %{build_base}
%if %{with python2}
rm -r %{buildroot}%{package_libdir}/libboost_python.so
rm -r %{buildroot}%{package_libdir}/libboost_mpi_python.so
ln -s libboost_mpi_python-py2_7.so %{buildroot}%{package_libdir}/libboost_mpi_python.so
ln -s libboost_python-py2_7.so %{buildroot}%{package_libdir}/libboost_python.so
%endif
%if %{with python3}
! $(ldd %{buildroot}%{package_libdir}/*.so* | grep python3-\\.)
ln -s libboost_python-py3.so %{buildroot}%{package_libdir}/libboost_python3.so
%endif
# Move Python libraries over to proper places
%if %{with python2}
mkdir -p %{buildroot}%{package_python2_sitearch}/boost/parallel/mpi/
mv %{buildroot}/%{package_libdir}/mpi.so %{buildroot}%{package_python2_sitearch}/boost/parallel/mpi/
install -m 0644 libs/mpi/build/__init__.py %{buildroot}%{package_python2_sitearch}/boost/parallel/mpi/
install -m 0644 %{SOURCE11} %{buildroot}%{package_python2_sitearch}/boost/parallel
install -m 0644 %{SOURCE11} %{buildroot}%{package_python2_sitearch}/boost
%endif
%if %{with python3}
mkdir -p %{buildroot}%{package_python3_sitearch}/boost/parallel/mpi/
mv %{buildroot}/%{package_libdir}/mpi.*so %{buildroot}%{package_python3_sitearch}/boost/parallel/mpi/mpi.%{py3_soflags}.so
@@ -1625,9 +1464,6 @@ prepend-path CPATH %{hpc_includedir}
prepend-path C_INCLUDE_PATH %{hpc_includedir}
prepend-path CPLUS_INCLUDE_PATH %{hpc_includedir}
}
if ([file isdirectory %{package_python2_sitearch}]) {
prepend-path PYTHONPATH %{package_python2_sitearch}
}
if ([file isdirectory %{package_python3_sitearch}]) {
prepend-path PYTHONPATH %{package_python3_sitearch}
}
@@ -1665,12 +1501,6 @@ EOF
%post -n libboost_locale%{library_version} -p /sbin/ldconfig
%post -n libboost_timer%{library_version} -p /sbin/ldconfig
%else
%if %{with python2}
%post -n libboost_python-py2_7-%{library_version} -p /sbin/ldconfig
%if %{with python_numpy}
%post -n libboost_numpy-py2_7-%{library_version} -p /sbin/ldconfig
%endif
%endif
%if %{with python3}
%post -n libboost_python-py3-%{library_version} -p /sbin/ldconfig
@@ -1682,9 +1512,6 @@ EOF
%if %{with mpi}
%post -n libboost_mpi%{library_version} -p /sbin/ldconfig
%post -n libboost_graph_parallel%{library_version} -p /sbin/ldconfig
%if %{with python2}
%post -n libboost_mpi_python-py2_7-%{library_version} -p /sbin/ldconfig
%endif
%if %{with python3}
%post -n libboost_mpi_python-py3-%{library_version} -p /sbin/ldconfig
@@ -1724,12 +1551,6 @@ EOF
%postun -n libboost_locale%{library_version} -p /sbin/ldconfig
%postun -n libboost_timer%{library_version} -p /sbin/ldconfig
%else
%if %{with python2}
%postun -n libboost_python-py2_7-%{library_version} -p /sbin/ldconfig
%if %{with python_numpy}
%postun -n libboost_numpy-py2_7-%{library_version} -p /sbin/ldconfig
%endif
%endif
%if %{with python3}
%postun -n libboost_python-py3-%{library_version} -p /sbin/ldconfig
@@ -1741,9 +1562,6 @@ EOF
%if %{with mpi}
%postun -n libboost_mpi%{library_version} -p /sbin/ldconfig
%postun -n libboost_graph_parallel%{library_version} -p /sbin/ldconfig
%if %{with python2}
%postun -n libboost_mpi_python-py2_7-%{library_version} -p /sbin/ldconfig
%endif
%if %{with python3}
%postun -n libboost_mpi_python-py3-%{library_version} -p /sbin/ldconfig
@@ -1765,9 +1583,6 @@ EOF
%dir %{hpc_install_path}
%package_libdir
%exclude %package_libdir/*.so
%if %{with python2}
%exclude %package_python2_sitearch
%endif
%if %{with python3}
%exclude %package_python3_sitearch
%endif
@@ -1775,10 +1590,6 @@ EOF
%files -n %{package_name}-devel
%package_includedir
%package_libdir/*.so
%if %{with python2}
%files -n %{package_name}-python2
%package_python2_sitearch
%endif
%if %{with python3}
%files -n %{package_name}-python3
%package_python3_sitearch
@@ -1967,33 +1778,11 @@ EOF
%{package_libdir}/cmake/boost_graph_parallel-%{version}/*
%{package_libdir}/libboost_graph_parallel.so
%if %{with python2}
%files -n libboost_mpi_python-py2_7-%{library_version}
%{package_libdir}/libboost_mpi_python-py2_7.so.%{version}
%files -n libboost_mpi_python-py2_7-%{library_version}-devel
%dir %{package_libdir}/cmake
%dir %{package_libdir}/cmake/boost_mpi_python-%{version}
%{package_libdir}/cmake/boost_mpi_python-%{version}/*
%{package_libdir}/libboost_mpi_python-py2_7.so
%{package_libdir}/libboost_mpi_python.so
%files -n python2-boost_parallel_mpi%{library_version}
%dir %{package_python2_sitearch}/boost
%dir %{package_python2_sitearch}/boost/parallel
%dir %{package_python2_sitearch}/boost/parallel/mpi
%{package_python2_sitearch}/boost/__init__.py
%{package_python2_sitearch}/boost/parallel/__init__.py
%{package_python2_sitearch}/boost/parallel/mpi/__init__.py
%{package_python2_sitearch}/boost/parallel/mpi/mpi.so
%endif
%if %{with python3}
%files -n libboost_mpi_python-py3-%{library_version}
%{package_libdir}/libboost_mpi_python-py3.so.%{version}
%files -n libboost_mpi_python-py3-%{library_version}-devel
%if ! %{with python2}
%dir %{package_libdir}/cmake/boost_mpi_python-%{version}
%{package_libdir}/cmake/boost_mpi_python-%{version}/*
%endif
@@ -2007,30 +1796,6 @@ EOF
%{package_python3_sitearch}/boost/parallel/__init__.py
%{package_python3_sitearch}/boost/parallel/mpi/__init__.py
%{package_python3_sitearch}/boost/parallel/mpi/mpi.%{py3_soflags}.so
%endif
%endif
%if %{with python2}
%files -n libboost_python-py2_7-%{library_version}
%{package_libdir}/libboost_python-py2_7.so.%{version}
%files -n libboost_python-py2_7-%{library_version}-devel
##%dir %{package_libdir}/cmake/boost_python-%{version}
##%{package_libdir}/cmake/boost_python-%{version}/*
%{package_libdir}/libboost_python.so
%{package_libdir}/libboost_python-py2_7.so
%if %{with python_numpy}
%files -n libboost_numpy-py2_7-%{library_version}
%{package_libdir}/libboost_numpy-py2_7.so.%{version}
%files -n libboost_numpy-py2_7-%{library_version}-devel
##%dir %{package_libdir}/cmake/boost_numpy-%{version}
##%{package_libdir}/cmake/boost_numpy-%{version}/*
%{package_libdir}/libboost_numpy-py2_7.so
%endif
%endif
%if %{with python3}