summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packaging/boost.spec53
1 files changed, 26 insertions, 27 deletions
diff --git a/packaging/boost.spec b/packaging/boost.spec
index b67b774..bfb9429 100644
--- a/packaging/boost.spec
+++ b/packaging/boost.spec
@@ -17,21 +17,9 @@
# Just hardcode build_mpi to 1 as soon as openmpi builds on all
# named architectures.
-# TODO: make openmpi package
%define build_mpi 0
-
-# context hasn't been ported to most architectures yet
-%ifarch %ix86 x86_64 %arm mips ppc ppc64 ppc64le
-%define build_context 1
-%else
-%define build_context 0
-%endif
-
-%ifarch hppa
-%define disable_long_double 1
-%else
+%define build_coroutine 0
%define disable_long_double 0
-%endif
%define boost_libs1 boost-date-time boost-filesystem boost-graph
%define boost_libs2 boost-iostreams boost-math boost-test
@@ -40,17 +28,9 @@
%define boost_libs5 boost-wave boost-regex
%define boost_libs6 boost-random boost-chrono boost-locale
%define boost_libs7 boost-timer boost-atomic boost-log boost-container
-%if %build_context
-%define boost_libs_context boost-context boost-coroutine
-%endif
-%define most_libs %boost_libs1 %boost_libs2 %boost_libs3 %boost_libs4 %boost_libs5 %boost_libs6 %boost_libs7 %{?boost_libs_context}
-
-%if %build_mpi
-%define all_libs %{most_libs} boost-graph-parallel boost-mpi
-%else
-%define all_libs %{most_libs}
-%endif
+%define most_libs %boost_libs1 %boost_libs2 %boost_libs3 %boost_libs4 %boost_libs5 %boost_libs6 %boost_libs7
+%define all_libs %{most_libs} boost-context
Name: boost
BuildRequires: boost-jam
@@ -153,6 +133,14 @@ Requires: boost-license
Run-Time support for Boost.Context, a foundational library that
provides a sort of cooperative multitasking on a single thread.
+%package -n boost-fiber
+Summary: Run-Time component of boost fiber
+Group: System/Libraries
+Requires: boost-license
+
+%description -n boost-fiber
+Run-Time support for Boost.fiber
+
%package -n boost-coroutine
Summary: Boost::Coroutine Runtime libraries
Group: System/Libraries
@@ -401,9 +389,10 @@ export REGEX_FLAGS="--with-icu"
export EXPAT_INCLUDE=/usr/include EXPAT_LIBPATH=%{_libdir}
export PYTHON_FLAGS
LIBRARIES_FLAGS=--with-libraries=all
-%if !%build_context
+
+%if !%build_coroutine
# coroutine depends on context
-LIBRARIES_FLAGS+=" --without-libraries=context,coroutine"
+LIBRARIES_FLAGS+=" --without-libraries=coroutine,fiber"
%endif
EOF
@@ -545,6 +534,7 @@ cp -af LICENSE_1_0.txt %{buildroot}/usr/share/license/%{name}
%post -n boost-atomic -p /sbin/ldconfig
%post -n boost-container -p /sbin/ldconfig
%post -n boost-context -p /sbin/ldconfig
+%post -n boost-fiber -p /sbin/ldconfig
%post -n boost-coroutine -p /sbin/ldconfig
%post -n boost-date-time -p /sbin/ldconfig
%post -n boost-filesystem -p /sbin/ldconfig
@@ -576,6 +566,7 @@ cp -af LICENSE_1_0.txt %{buildroot}/usr/share/license/%{name}
%postun -n boost-atomic -p /sbin/ldconfig
%postun -n boost-container -p /sbin/ldconfig
%postun -n boost-context -p /sbin/ldconfig
+%postun -n boost-fiber -p /sbin/ldconfig
%postun -n boost-coroutine -p /sbin/ldconfig
%postun -n boost-date-time -p /sbin/ldconfig
%postun -n boost-filesystem -p /sbin/ldconfig
@@ -626,18 +617,26 @@ cp -af LICENSE_1_0.txt %{buildroot}/usr/share/license/%{name}
%license LICENSE_1_0.txt
%{_libdir}/libboost_container*.so.*
-%if %build_context
+
%manifest %{name}.manifest
%files -n boost-context
%defattr(-, root, root, -)
%license LICENSE_1_0.txt
%{_libdir}/libboost_context*.so.*
+%if %build_coroutine
+
%files -n boost-coroutine
-%manifest %{name}.manifest
%defattr(-, root, root, -)
%license LICENSE_1_0.txt
%{_libdir}/libboost_coroutine*.so.*
+
+
+%files -n boost-fiber
+%defattr(-, root, root, -)
+%license LICENSE_1_0.txt
+%{_libdir}/libboost_fiber*.so.*
+
%endif
%files -n boost-date-time