!26 fix master build

From: @xinghe_1
Reviewed-by: @SuperSix173
Signed-off-by: @SuperSix173
This commit is contained in:
openeuler-ci-bot 2021-02-04 16:05:08 +08:00 committed by Gitee
commit 154d23f340

View File

@ -5,6 +5,7 @@
%global toplev_dirname %{name}_%{version_enc} %global toplev_dirname %{name}_%{version_enc}
%global sonamever %{version} %global sonamever %{version}
%global python3_lib_version 38 %global python3_lib_version 38
%global old_so_version 1.73
%bcond_with mpich %bcond_with mpich
%bcond_with openmpi %bcond_with openmpi
@ -22,7 +23,7 @@
Name: boost Name: boost
Version: 1.75.0 Version: 1.75.0
Release: 1 Release: 2
Summary: The free peer-reviewed portable C++ source libraries Summary: The free peer-reviewed portable C++ source libraries
License: Boost Software license V1.0 License: Boost Software license V1.0
URL: http://www.boost.org URL: http://www.boost.org
@ -701,8 +702,8 @@ echo ============================= install $MPI_COMPILER ==================
variant=release threading=multi debug-symbols=on pch=off \ variant=release threading=multi debug-symbols=on pch=off \
python=%{python3_version} stage python=%{python3_version} stage
mkdir -p ${RPM_BUILD_ROOT}%{python2_sitearch}/openmpi/boost mkdir -p ${RPM_BUILD_ROOT}%{python3_sitearch}/openmpi/boost
touch ${RPM_BUILD_ROOT}%{python2_sitearch}/openmpi/boost/__init__.py touch ${RPM_BUILD_ROOT}%{python3_sitearch}/openmpi/boost/__init__.py
mv ${RPM_BUILD_ROOT}${MPI_HOME}/lib/boost-python%{python3_version}/mpi.so \ mv ${RPM_BUILD_ROOT}${MPI_HOME}/lib/boost-python%{python3_version}/mpi.so \
${RPM_BUILD_ROOT}%{python3_sitearch}/openmpi/boost/ ${RPM_BUILD_ROOT}%{python3_sitearch}/openmpi/boost/
%endif %endif
@ -774,7 +775,7 @@ echo ============================= install Boost.Build ==================
install -m 755 %{_builddir}/%{name}_%{version_enc}/tools/build/b2 $RPM_BUILD_ROOT%{_bindir}/bjam install -m 755 %{_builddir}/%{name}_%{version_enc}/tools/build/b2 $RPM_BUILD_ROOT%{_bindir}/bjam
%{__install} -p -m 644 %{SOURCE2} -D $RPM_BUILD_ROOT%{_mandir}/man1/bjam.1 %{__install} -p -m 644 %{SOURCE2} -D $RPM_BUILD_ROOT%{_mandir}/man1/bjam.1
cp %{_libdir}/libboost_*.so.1.66.* $RPM_BUILD_ROOT%{_libdir} cp %{_libdir}/libboost_*.so.%{old_so_version}.* $RPM_BUILD_ROOT%{_libdir}
) )
echo ============================= install Boost.QuickBook ================== echo ============================= install Boost.QuickBook ==================
@ -863,73 +864,73 @@ fi
%files %files
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%exclude %{_libdir}/libboost_signals.so.1.66.0
%files contract %files contract
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_contract.so.%{sonamever} %{_libdir}/libboost_contract.so.%{sonamever}
%{_libdir}/libboost_contract.so.%{old_so_version}.*
%files atomic %files atomic
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_atomic.so.%{sonamever} %{_libdir}/libboost_atomic.so.%{sonamever}
%{_libdir}/libboost_atomic.so.1.66.* %{_libdir}/libboost_atomic.so.%{old_so_version}.*
%files chrono %files chrono
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_chrono.so.%{sonamever} %{_libdir}/libboost_chrono.so.%{sonamever}
%{_libdir}/libboost_chrono.so.1.66.* %{_libdir}/libboost_chrono.so.%{old_so_version}.*
%files container %files container
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_container.so.%{sonamever} %{_libdir}/libboost_container.so.%{sonamever}
%{_libdir}/libboost_container.so.1.66.* %{_libdir}/libboost_container.so.%{old_so_version}.*
%files context %files context
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_context.so.%{sonamever} %{_libdir}/libboost_context.so.%{sonamever}
%{_libdir}/libboost_context.so.1.66.* %{_libdir}/libboost_context.so.%{old_so_version}.*
%files coroutine %files coroutine
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_coroutine.so.%{sonamever} %{_libdir}/libboost_coroutine.so.%{sonamever}
%{_libdir}/libboost_coroutine.so.1.66.* %{_libdir}/libboost_coroutine.so.%{old_so_version}.*
%files date-time %files date-time
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_date_time.so.%{sonamever} %{_libdir}/libboost_date_time.so.%{sonamever}
%{_libdir}/libboost_date_time.so.1.66.* %{_libdir}/libboost_date_time.so.%{old_so_version}.*
%files fiber %files fiber
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_fiber.so.%{sonamever} %{_libdir}/libboost_fiber.so.%{sonamever}
%{_libdir}/libboost_fiber.so.1.66.* %{_libdir}/libboost_fiber.so.%{old_so_version}.*
%files filesystem %files filesystem
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_filesystem.so.%{sonamever} %{_libdir}/libboost_filesystem.so.%{sonamever}
%{_libdir}/libboost_filesystem.so.1.66.* %{_libdir}/libboost_filesystem.so.%{old_so_version}.*
%files graph %files graph
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_graph.so.%{sonamever} %{_libdir}/libboost_graph.so.%{sonamever}
%{_libdir}/libboost_graph.so.1.66.* %{_libdir}/libboost_graph.so.%{old_so_version}.*
%files iostreams %files iostreams
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_iostreams.so.%{sonamever} %{_libdir}/libboost_iostreams.so.%{sonamever}
%{_libdir}/libboost_iostreams.so.1.66.* %{_libdir}/libboost_iostreams.so.%{old_so_version}.*
%files locale %files locale
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_locale.so.%{sonamever} %{_libdir}/libboost_locale.so.%{sonamever}
%{_libdir}/libboost_locale.so.1.66.* %{_libdir}/libboost_locale.so.%{old_so_version}.*
%files log %files log
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_log.so.%{sonamever} %{_libdir}/libboost_log.so.%{sonamever}
%{_libdir}/libboost_log.so.1.66.* %{_libdir}/libboost_log.so.%{old_so_version}.*
%{_libdir}/libboost_log_setup.so.%{sonamever} %{_libdir}/libboost_log_setup.so.%{sonamever}
%{_libdir}/libboost_log_setup.so.1.66.* %{_libdir}/libboost_log_setup.so.%{old_so_version}.*
%files math %files math
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
@ -940,12 +941,12 @@ fi
%{_libdir}/libboost_math_tr1f.so.%{sonamever} %{_libdir}/libboost_math_tr1f.so.%{sonamever}
%{_libdir}/libboost_math_tr1l.so.%{sonamever} %{_libdir}/libboost_math_tr1l.so.%{sonamever}
%{_libdir}/libboost_math_c99.so.1.66.* %{_libdir}/libboost_math_c99.so.%{old_so_version}.*
%{_libdir}/libboost_math_c99f.so.1.66.* %{_libdir}/libboost_math_c99f.so.%{old_so_version}.*
%{_libdir}/libboost_math_c99l.so.1.66.* %{_libdir}/libboost_math_c99l.so.%{old_so_version}.*
%{_libdir}/libboost_math_tr1.so.1.66.* %{_libdir}/libboost_math_tr1.so.%{old_so_version}.*
%{_libdir}/libboost_math_tr1f.so.1.66.* %{_libdir}/libboost_math_tr1f.so.%{old_so_version}.*
%{_libdir}/libboost_math_tr1l.so.1.66.* %{_libdir}/libboost_math_tr1l.so.%{old_so_version}.*
%files nowide %files nowide
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
@ -956,12 +957,12 @@ fi
%files numpy3 %files numpy3
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_numpy%{python3_lib_version}.so.%{sonamever} %{_libdir}/libboost_numpy%{python3_lib_version}.so.%{sonamever}
%{_libdir}/libboost_numpy3.so.1.66.* %{_libdir}/libboost_numpy%{python3_lib_version}.so.%{old_so_version}.*
%files python3 %files python3
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_python%{python3_lib_version}.so.%{sonamever} %{_libdir}/libboost_python%{python3_lib_version}.so.%{sonamever}
%{_libdir}/libboost_python3.so.1.66.* %{_libdir}/libboost_python%{python3_lib_version}.so.%{old_so_version}.*
%files python3-devel %files python3-devel
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
@ -974,64 +975,64 @@ fi
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_prg_exec_monitor.so.%{sonamever} %{_libdir}/libboost_prg_exec_monitor.so.%{sonamever}
%{_libdir}/libboost_unit_test_framework.so.%{sonamever} %{_libdir}/libboost_unit_test_framework.so.%{sonamever}
%{_libdir}/libboost_prg_exec_monitor.so.1.66.* %{_libdir}/libboost_prg_exec_monitor.so.%{old_so_version}.*
%{_libdir}/libboost_unit_test_framework.so.1.66.* %{_libdir}/libboost_unit_test_framework.so.%{old_so_version}.*
%files program-options %files program-options
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_program_options.so.%{sonamever} %{_libdir}/libboost_program_options.so.%{sonamever}
%{_libdir}/libboost_program_options.so.1.66.* %{_libdir}/libboost_program_options.so.%{old_so_version}.*
%files random %files random
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_random.so.%{sonamever} %{_libdir}/libboost_random.so.%{sonamever}
%{_libdir}/libboost_random.so.1.66.* %{_libdir}/libboost_random.so.%{old_so_version}.*
%files regex %files regex
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_regex.so.%{sonamever} %{_libdir}/libboost_regex.so.%{sonamever}
%{_libdir}/libboost_regex.so.1.66.* %{_libdir}/libboost_regex.so.%{old_so_version}.*
%files serialization %files serialization
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_serialization.so.%{sonamever} %{_libdir}/libboost_serialization.so.%{sonamever}
%{_libdir}/libboost_wserialization.so.%{sonamever} %{_libdir}/libboost_wserialization.so.%{sonamever}
%{_libdir}/libboost_serialization.so.1.66.* %{_libdir}/libboost_serialization.so.%{old_so_version}.*
%{_libdir}/libboost_wserialization.so.1.66.* %{_libdir}/libboost_wserialization.so.%{old_so_version}.*
%files stacktrace %files stacktrace
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_stacktrace_addr2line.so.%{sonamever} %{_libdir}/libboost_stacktrace_addr2line.so.%{sonamever}
%{_libdir}/libboost_stacktrace_basic.so.%{sonamever} %{_libdir}/libboost_stacktrace_basic.so.%{sonamever}
%{_libdir}/libboost_stacktrace_noop.so.%{sonamever} %{_libdir}/libboost_stacktrace_noop.so.%{sonamever}
%{_libdir}/libboost_stacktrace_addr2line.so.1.66.* %{_libdir}/libboost_stacktrace_addr2line.so.%{old_so_version}.*
%{_libdir}/libboost_stacktrace_basic.so.1.66.* %{_libdir}/libboost_stacktrace_basic.so.%{old_so_version}.*
%{_libdir}/libboost_stacktrace_noop.so.1.66.* %{_libdir}/libboost_stacktrace_noop.so.%{old_so_version}.*
%files system %files system
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_system.so.%{sonamever} %{_libdir}/libboost_system.so.%{sonamever}
%{_libdir}/libboost_system.so.1.66.* %{_libdir}/libboost_system.so.%{old_so_version}.*
%files thread %files thread
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_thread.so.%{sonamever} %{_libdir}/libboost_thread.so.%{sonamever}
%{_libdir}/libboost_thread.so.1.66.* %{_libdir}/libboost_thread.so.%{old_so_version}.*
%files timer %files timer
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_timer.so.%{sonamever} %{_libdir}/libboost_timer.so.%{sonamever}
%{_libdir}/libboost_timer.so.1.66.* %{_libdir}/libboost_timer.so.%{old_so_version}.*
%files type_erasure %files type_erasure
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_type_erasure.so.%{sonamever} %{_libdir}/libboost_type_erasure.so.%{sonamever}
%{_libdir}/libboost_type_erasure.so.1.66.* %{_libdir}/libboost_type_erasure.so.%{old_so_version}.*
%files wave %files wave
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_wave.so.%{sonamever} %{_libdir}/libboost_wave.so.%{sonamever}
%{_libdir}/libboost_wave.so.1.66.* %{_libdir}/libboost_wave.so.%{old_so_version}.*
%files help %files help
%doc %{boost_docdir}/* %doc %{boost_docdir}/*
@ -1127,6 +1128,9 @@ fi
%{_mandir}/man1/bjam.1* %{_mandir}/man1/bjam.1*
%changelog %changelog
* Thu Feb 4 2021 xinghe <xinghe1@huawei.com> - 1.75.0-2
- fix master build
* Wed Feb 3 2021 xinghe <xinghe1@huawei.com> - 1.75.0-1 * Wed Feb 3 2021 xinghe <xinghe1@huawei.com> - 1.75.0-1
- update version to 1.75.0 - update version to 1.75.0