Accepting request 780354 from home:eeich:branches:devel:libraries:c_c++
- Fix macro which defines the name of the HPC python3 library directory (bsc#1165277). - Include headers and serial libs in the HPC MPI packages (bsc#1165307). OBS-URL: https://build.opensuse.org/request/show/780354 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=249
This commit is contained in:
parent
2b3527b644
commit
f5946efe2f
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 28 13:54:37 UTC 2020 - Egbert Eich <eich@suse.com>
|
||||
|
||||
- Fix macro which defines the name of the HPC python3 library
|
||||
directory (bsc#1165277).
|
||||
- Include headers and serial libs in the HPC MPI packages
|
||||
(bsc#1165307).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 13 10:42:07 UTC 2020 - Christian Goll <cgoll@suse.com>
|
||||
|
||||
|
16
boost.spec
16
boost.spec
@ -169,7 +169,7 @@ ExcludeArch: s390x %{ix86} ppc64 ppc64le ia64 hppa
|
||||
%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_libdir}/python3.[0-9]/site-packages
|
||||
%define package_python3_sitearch %{_hpc_python_sysconfig_path /usr/bin/python3 platlib %{?hpc_prefix}}
|
||||
%else
|
||||
%define package_prefix %{_prefix}
|
||||
%define package_bindir %{_bindir}
|
||||
@ -1536,13 +1536,14 @@ install -m 0755 dist/bin/quickbook %{buildroot}%{package_bindir}/quickbook
|
||||
%endif # ! hpc
|
||||
%endif # ! build_base
|
||||
|
||||
%if %{build_base}
|
||||
%if %{build_base} || %{with hpc}
|
||||
mkdir -p %{buildroot}%{package_bindir}
|
||||
%if %{without hpc}
|
||||
install -m 755 b2 %{buildroot}%{package_bindir}/bjam
|
||||
ln -s bjam %{buildroot}%{package_bindir}/jam
|
||||
%endif
|
||||
|
||||
%if %{build_base}
|
||||
# Remove exception library, but only if the symbols are not
|
||||
# actually used. For now, the only symbol that is linked is
|
||||
# should never be used as it's only available on Windows. So,
|
||||
@ -1554,16 +1555,17 @@ objdump -Ctj .text -Ctj .text %{buildroot}%{package_libdir}/libboost_exception.s
|
||||
rm %{buildroot}%{package_libdir}/libboost_exception.so
|
||||
rm %{buildroot}%{package_libdir}/libboost_exception.so.%{version}
|
||||
|
||||
# not used or duplicated in boost-extra flavour
|
||||
rm -r %{buildroot}%{package_libdir}/cmake/boost_stacktrace_{backtrace,windbg}*
|
||||
rm -r %{buildroot}%{package_libdir}/cmake/boost_exception-*
|
||||
rm -r %{buildroot}%{package_libdir}/cmake/boost_graph_parallel-%{version}
|
||||
%endif
|
||||
|
||||
%fdupes %{buildroot}%{package_includedir}/boost
|
||||
mkdir -p %{buildroot}%{my_docdir}
|
||||
%if 0%{?sle_version} >= 120000 && 0%{?sle_version} <= 120200 && !0%{?is_opensuse}
|
||||
mkdir -p %{buildroot}%{_defaultlicensedir}
|
||||
%endif
|
||||
|
||||
# not used or duplicated in boost-extra flavour
|
||||
rm -r %{buildroot}%{package_libdir}/cmake/boost_stacktrace_{backtrace,windbg}*
|
||||
rm -r %{buildroot}%{package_libdir}/cmake/boost_exception-*
|
||||
rm -r %{buildroot}%{package_libdir}/cmake/boost_graph_parallel-%{version}
|
||||
%else # ! build_base
|
||||
# duplicate from boost-base flavour
|
||||
rm %{buildroot}%{package_libdir}/cmake/BoostDetectToolset-%{version}.cmake
|
||||
|
Loading…
x
Reference in New Issue
Block a user