forked from pool/boost
Accepting request 859474 from devel:libraries:c_c++
- Log additional information during build - Add missing dependencies in libboost_iostream-devel (bsc#1180359) (forwarded request 859473 from adamm) OBS-URL: https://build.opensuse.org/request/show/859474 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boost?expand=0&rev=144
This commit is contained in:
commit
4fc4e58013
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Dec 28 15:09:51 UTC 2020 - Adam Majer <adam.majer@suse.de>
|
||||||
|
|
||||||
|
- Log additional information during build
|
||||||
|
- Add missing dependencies in libboost_iostream-devel (bsc#1180359)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Dec 23 11:04:47 UTC 2020 - Adam Majer <adam.majer@suse.de>
|
Wed Dec 23 11:04:47 UTC 2020 - Adam Majer <adam.majer@suse.de>
|
||||||
|
|
||||||
|
14
boost.spec
14
boost.spec
@ -629,6 +629,8 @@ Summary: Development headers for Boost.IOStreans library
|
|||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
Requires: libboost_headers%{library_version}-devel = %{version}
|
Requires: libboost_headers%{library_version}-devel = %{version}
|
||||||
Requires: libboost_iostreams%{library_version} = %{version}
|
Requires: libboost_iostreams%{library_version} = %{version}
|
||||||
|
Requires: pkgconfig(bzip2)
|
||||||
|
Requires: pkgconfig(zlib)
|
||||||
Conflicts: boost-devel < 1.63
|
Conflicts: boost-devel < 1.63
|
||||||
Conflicts: libboost_iostreams-devel-impl
|
Conflicts: libboost_iostreams-devel-impl
|
||||||
Conflicts: libboost_iostreams1_66_0-devel
|
Conflicts: libboost_iostreams1_66_0-devel
|
||||||
@ -1290,6 +1292,7 @@ using mpi ;
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
./b2 -d+2 -q --user-config=./user-config-py3.jam \
|
./b2 -d+2 -q --user-config=./user-config-py3.jam \
|
||||||
|
--debug-configuration \
|
||||||
--build-type=minimal --build-dir=./python3-build \
|
--build-type=minimal --build-dir=./python3-build \
|
||||||
--python-buildid=py3 \
|
--python-buildid=py3 \
|
||||||
--stagedir=./python3-stage %{?_smp_mflags} \
|
--stagedir=./python3-stage %{?_smp_mflags} \
|
||||||
@ -1319,6 +1322,7 @@ echo 'using mpi ;' >> ./user-config.jam
|
|||||||
|
|
||||||
# This is run for both mini and non-mini build
|
# This is run for both mini and non-mini build
|
||||||
./b2 -d+2 -q --user-config=./user-config.jam \
|
./b2 -d+2 -q --user-config=./user-config.jam \
|
||||||
|
--debug-configuration \
|
||||||
--build-type=minimal --build-dir=./build \
|
--build-type=minimal --build-dir=./build \
|
||||||
--stagedir=./stage %{?_smp_mflags} \
|
--stagedir=./stage %{?_smp_mflags} \
|
||||||
$LIBRARIES_FLAGS \
|
$LIBRARIES_FLAGS \
|
||||||
@ -1335,13 +1339,13 @@ chmod +x symbol_diff.sh
|
|||||||
%if ! %{with hpc}
|
%if ! %{with hpc}
|
||||||
%if %{with build_quickbook}
|
%if %{with build_quickbook}
|
||||||
pushd tools/quickbook
|
pushd tools/quickbook
|
||||||
../../b2 --user-config=../../user-config.jam --v2 dist-bin %{?_smp_mflags}
|
../../b2 --debug-configuration --user-config=../../user-config.jam --v2 dist-bin %{?_smp_mflags}
|
||||||
popd
|
popd
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with build_docs}
|
%if %{with build_docs}
|
||||||
cd doc
|
cd doc
|
||||||
./b2 --user-config=../user-config.jam --v2 man %{?_smp_mflags}
|
./b2 --debug-configuration --user-config=../user-config.jam --v2 man %{?_smp_mflags}
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -1365,6 +1369,7 @@ module load gnu %mpi_flavor
|
|||||||
|
|
||||||
%if %{with python3}
|
%if %{with python3}
|
||||||
./b2 -d+2 -q --user-config=./user-config-py3.jam \
|
./b2 -d+2 -q --user-config=./user-config-py3.jam \
|
||||||
|
--debug-configuration \
|
||||||
--build-type=minimal --build-dir=./python3-build \
|
--build-type=minimal --build-dir=./python3-build \
|
||||||
--python-buildid=py3 \
|
--python-buildid=py3 \
|
||||||
--prefix=%{buildroot}%{package_prefix} --exec-prefix=%{buildroot}%{package_bindir} \
|
--prefix=%{buildroot}%{package_prefix} --exec-prefix=%{buildroot}%{package_bindir} \
|
||||||
@ -1378,6 +1383,7 @@ module load gnu %mpi_flavor
|
|||||||
|
|
||||||
# Generic install
|
# Generic install
|
||||||
./b2 -d+2 -q \
|
./b2 -d+2 -q \
|
||||||
|
--debug-configuration \
|
||||||
--build-type=minimal --build-dir=./build --stagedir=./stage \
|
--build-type=minimal --build-dir=./build --stagedir=./stage \
|
||||||
--prefix=%{buildroot}%{package_prefix} --exec-prefix=%{buildroot}%{package_bindir} \
|
--prefix=%{buildroot}%{package_prefix} --exec-prefix=%{buildroot}%{package_bindir} \
|
||||||
--libdir=%{buildroot}%{package_libdir} --includedir=%{buildroot}%{package_includedir} \
|
--libdir=%{buildroot}%{package_libdir} --includedir=%{buildroot}%{package_includedir} \
|
||||||
@ -1472,10 +1478,6 @@ rm -r %{buildroot}%{package_libdir}/cmake/Boost-%{version}
|
|||||||
rm -r %{buildroot}%{package_libdir}/cmake/boost_headers-%{version}
|
rm -r %{buildroot}%{package_libdir}/cmake/boost_headers-%{version}
|
||||||
rm -r %{buildroot}%{package_libdir}/cmake/boost_{w,}serialization-%{version}
|
rm -r %{buildroot}%{package_libdir}/cmake/boost_{w,}serialization-%{version}
|
||||||
|
|
||||||
rm -rf %{buildroot}%{package_libdir}/libboost_numpy.so{,.%{version}}
|
|
||||||
rm -rf %{buildroot}%{package_libdir}/libboost_mpi_python.so.%{version}
|
|
||||||
rm -rf %{buildroot}%{package_libdir}/libboost_python.so.%{version}
|
|
||||||
|
|
||||||
rm -r %{buildroot}%{package_includedir}/boost
|
rm -r %{buildroot}%{package_includedir}/boost
|
||||||
rm %{buildroot}%{package_libdir}/libboost_{w,}serialization*
|
rm %{buildroot}%{package_libdir}/libboost_{w,}serialization*
|
||||||
rmdir --ignore-fail-on-non-empty %{buildroot}%{package_libdir}
|
rmdir --ignore-fail-on-non-empty %{buildroot}%{package_libdir}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user