# - split shared libs from core package into -iostreams/-serialization.
#
# Conditional build:
-%bcond_without python # without boost-python support
-#
+%bcond_without python2 # without boost-python2 support
+%bcond_without python3 # without boost-python3 support
+
%define fver %(echo %{version} | tr . _)
Summary: The Boost C++ Libraries
Summary(pl.UTF-8): Biblioteki C++ "Boost"
Name: boost
-Version: 1.49.0
-Release: 2
+Version: 1.61.0
+Release: 1
License: Boost Software License and others
Group: Libraries
Source0: http://downloads.sourceforge.net/boost/%{name}_%{fver}.tar.bz2
-# Source0-md5: 0d202cb811f934282dea64856a175698
+# Source0-md5: 6095876341956f65f9d35939ccea1a9f
Patch0: %{name}-link.patch
+Patch1: %{name}-x32-context.patch
+Patch2: %{name}-clean-gcc-flags.patch
+# FC Patches:
+# https://svn.boost.org/trac/boost/ticket/5637
+Patch203: %{name}-1.54.0-mpl-print.patch
+# https://svn.boost.org/trac/boost/ticket/8881
+Patch221: %{name}-1.54.0-mpi-unused_typedef.patch
URL: http://www.boost.org/
BuildRequires: bzip2-devel
BuildRequires: expat-devel
BuildRequires: libstdc++-devel
BuildRequires: perl-base
%{?with_python:BuildRequires: python-devel >= 2.2}
+%{?with_python3:BuildRequires: python3-devel}
BuildRequires: rpm-pythonprov
BuildRequires: zlib-devel
BuildConflicts: gcc = 5:3.3.1
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define specflags -DBOOST_IOSTREAMS_USE_DEPRECATED=1
+
%description
The Boost web site provides free peer-reviewed portable C++ source
libraries. The emphasis is on libraries which work well with the C++
Summary(pl.UTF-8): Pliki nagłówkowe bibliotek C++ Boost
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: %{name}-chrono = %{version}-%{release}
+Requires: %{name}-context = %{version}-%{release}
Requires: %{name}-date_time = %{version}-%{release}
Requires: %{name}-filesystem = %{version}-%{release}
Requires: %{name}-graph = %{version}-%{release}
+Requires: %{name}-locale = %{version}-%{release}
+Requires: %{name}-log = %{version}-%{release}
Requires: %{name}-program_options = %{version}-%{release}
Requires: %{name}-regex = %{version}-%{release}
Requires: %{name}-signals = %{version}-%{release}
Requires: %{name}-system = %{version}-%{release}
Requires: %{name}-test = %{version}-%{release}
Requires: %{name}-thread = %{version}-%{release}
+Requires: %{name}-timer = %{version}-%{release}
Requires: %{name}-wave = %{version}-%{release}
Requires: libstdc++-devel
Obsoletes: boost-any-devel
%description static -l pl.UTF-8
Statyczne wersje podstawowych bibliotek C++ Boost.
+%package python-devel-common
+Summary: Boost.Python development headers
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki Boost.Python
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description python-devel-common
+Headers for the Boost.Python library.
+
+%description python-devel-common -l pl.UTF-8
+Pliki nagłówkowe biblioteki Boost.Python.
+
%package python
-Summary: Boost.Python library
-Summary(pl.UTF-8): biblioteka Boost.Python
+Summary: Boost.Python library for Python 2
+Summary(pl.UTF-8): Biblioteka Boost.Python dla Pythona 2
Group: Libraries
-%pyrequires_eq python
+Requires: python-libs
%description python
Use the Boost Python Library to quickly and easily export a C++
-library to Python such that the Python interface is very similar to
-the C++ interface. It is designed to be minimally intrusive on your
+library to Python 2 such that the Python 2 interface is very similar
+to the C++ interface. It is designed to be minimally intrusive on your
C++ design. In most cases, you should not have to alter your C++
classes in any way in order to use them with Boost.Python. The system
-should simply ``reflect'' your C++ classes and functions into Python.
+should simply ``reflect'' your C++ classes and functions into Python
+3.
%description python -l pl.UTF-8
Biblioteka Boost Python służy do szybkiego i prostego eksportu
-biblioteki C++ do Pythona, tak że interfejs Pythona jest bardzo
+biblioteki C++ do Pythona 2, tak że interfejs Pythona 2 jest bardzo
podobny do interfejsu C++. Biblioteka jest zaprojektowana tak, żeby
narzucać jak najmniej wymagań dotyczących konstrukcjii C++. W
większości przypadków nie trzeba w ogóle zmieniać własnych klas C++,
żeby używać ich z Boost.Python. System powinien po prostu ,,odbić''
-klasy C++ i funkcje do Pythona.
+klasy C++ i funkcje do Pythona 3.
%package python-devel
-Summary: Boost.Python development headers
-Summary(pl.UTF-8): Pliki nagłówkowe dla Boost.Python
+Summary: Boost.Python development files for Python 2
+Summary(pl.UTF-8): Pliki programistyczne biblioteki Boost.Python dla Pythona 2
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
Requires: %{name}-python = %{version}-%{release}
+Requires: %{name}-python-devel-common = %{version}-%{release}
%description python-devel
-Headers for the Boost.Python library.
+Boost.Python development files for Python 2.
%description python-devel -l pl.UTF-8
-Pliki nagłówkowe dla biblioteki Boost.Python.
+Pliki programistyczne biblioteki Boost.Python dla Pythona 2.
%package python-static
-Summary: Static version of Boost.Python library
-Summary(pl.UTF-8): Statyczna wersja biblioteki Boost.Python
+Summary: Static version of Boost.Python library for Python 2
+Summary(pl.UTF-8): Statyczna wersja biblioteki Boost.Python dla Pythona 2
Group: Development/Libraries
Requires: %{name}-python-devel = %{version}-%{release}
%description python-static
-Static version of Boost.Python library.
+Static version of Boost.Python library for Python 2.
%description python-static -l pl.UTF-8
-Statyczna wersja biblioteki Boost.Python.
+Statyczna wersja biblioteki Boost.Python dla Pythona 2.
+
+%package python3
+Summary: Boost.Python library for Python 3
+Summary(pl.UTF-8): biblioteka Boost.Python dla Pythona 3
+Group: Libraries
+Requires: python3-libs
+
+%description python3
+Use the Boost Python Library to quickly and easily export a C++
+library to Python 3 such that the Python 3 interface is very similar
+to the C++ interface. It is designed to be minimally intrusive on your
+C++ design. In most cases, you should not have to alter your C++
+classes in any way in order to use them with Boost.Python. The system
+should simply ``reflect'' your C++ classes and functions into Python
+3.
+
+%description python3 -l pl.UTF-8
+Biblioteka Boost Python służy do szybkiego i prostego eksportu
+biblioteki C++ do Pythona 3, tak że interfejs Pythona 3 jest bardzo
+podobny do interfejsu C++. Biblioteka jest zaprojektowana tak, żeby
+narzucać jak najmniej wymagań dotyczących konstrukcjii C++. W
+większości przypadków nie trzeba w ogóle zmieniać własnych klas C++,
+żeby używać ich z Boost.Python. System powinien po prostu ,,odbić''
+klasy C++ i funkcje do Pythona 3.
+
+%package python3-devel
+Summary: Boost.Python development files for Python 3
+Summary(pl.UTF-8): Pliki programistyczne biblioteki Boost.Python dla Pythona 3
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-python3 = %{version}-%{release}
+Requires: %{name}-python-devel-common = %{version}-%{release}
+
+%description python3-devel
+Boost.Python development files for Python 3.
+
+%description python3-devel -l pl.UTF-8
+Pliki programistyczne biblioteki Boost.Python dla Pythona 3.
+
+%package python3-static
+Summary: Static version of Boost.Python library for Python 3
+Summary(pl.UTF-8): Statyczna wersja biblioteki Boost.Python dla Pythona 3
+Group: Development/Libraries
+Requires: %{name}-python3-devel = %{version}-%{release}
+
+%description python3-static
+Static version of Boost.Python library for Python 3.
+
+%description python3-static -l pl.UTF-8
+Statyczna wersja biblioteki Boost.Python dla Pythona 3.
%package chrono
Summary: Useful time utilities
+Summary(pl.UTF-8): Przydatne funkcje związane z czasem
Group: Libraries
Obsoletes: boost < 1.33
%description chrono
Useful time utilities.
+%description chrono -l pl.UTF-8
+Przydatne funkcje związane z czasem.
+
+%package context
+Summary: Boost.Context - context switching library
+Summary(pl.UTF-8): Boost.Context - biblioteka do zmiany kontekstu
+Group: Libraries
+
+%description context
+Boost.Context - context switching library, providing a sort of
+cooperative multitasking on a single thread.
+
+%description context -l pl.UTF-8
+Boost.Context - biblioteka do zmiany kontekstu, zapewniająca pewną
+wielozadaniowość kooperatywnąw ramach pojedynczego wątku.
+
%package date_time
Summary: Date-Time library
Summary(pl.UTF-8): Biblioteka daty-czasu
%package locale
Summary: Provide localization and Unicode handling tools for C++
+Summary(pl.UTF-8): Narzędzia do obsługi lokalizacji i Unikodu w C++
Group: Libraries
%description locale
Provide localization and Unicode handling tools for C++.
+%description locale -l pl.UTF-8
+Narzędzia do obsługi lokalizacji i Unikodu w C++.
+
+%package log
+Summary: Provide logging tools for C++
+Summary(pl.UTF-8): Narzędzia do logowania w C++
+Group: Libraries
+
+%description log
+Provide logging tools for C++.
+
+%description log -l pl.UTF-8
+Narzędzia do logowania w C++.
+
%package program_options
Summary: Access to program options, via conventional methods such as command line and config file
Summary(pl.UTF-8): Dostęp do opcji programu za pomocą typowych metod, jak linia poleceń i plik konfiguracyjny
Shared library for Boost C++ regular expressions.
%description regex -l pl.UTF-8
-Biblioteka wyrażeń regularnych dla C++, biblioteki dzielone.
+Biblioteka współdzielona do obsługi wyrażeń regularnych w C++.
%package signals
Summary: Signals & slots callback implementation
Wsparcie dla prostego testowania programu, pełnego testowania i
monitorowania wykonania programu.
-%package timer
-Summary: Event timer, progress timer, and progress display classes
-Group: Libraries
-Obsoletes: boost < 1.33
-
-%description timer
-Event timer, progress timer, and progress display classes.
-
%package thread
Summary: Portable C++ threads library
Summary(pl.UTF-8): Przenośna biblioteka wątków C++
%description thread -l pl.UTF-8
Przenośna biblioteka wątków dla C++ - biblioteka dzielona.
+%package timer
+Summary: Event timer, progress timer, and progress display classes
+Summary(pl.UTF-8): Klasy do obsługi pomiarów czasu, postępu i wyświetlania postępu
+Group: Libraries
+Obsoletes: boost < 1.33
+
+%description timer
+Event timer, progress timer, and progress display classes.
+
+%description timer -l pl.UTF-8
+Klasy do obsługi pomiarów czasu, postępu i wyświetlania postępu.
+
%package wave
Summary: Boost.Wave - a standard compliant C++ preprocessor library
Summary(pl.UTF-8): Boost.Wave - zgodna ze standardem biblioteka preprocesora C++
Summary: Boost C++ Library documentation
Summary(pl.UTF-8): Dokumentacja dla biblioteki Boost C++
Group: Documentation
-Requires: %{name}-devel = %{version}-%{release}
+%if "%{_rpmversion}" >= "5"
+BuildArch: noarch
+%endif
%description doc
Documentation for the Boost C++ Library.
%prep
%setup -q -n %{name}_%{fver}
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
-# - don't know how to pass it through (b)jam -s (no way?)
-# due to oversophisticated build flags system.
-# - pass -fPIC due to <shared-linkable> removal.
-%{__sed} -i "s/<optimization>speed : -O3/<optimization>speed : ${CXXFLAGS:-%rpmcxxflags} -fPIC/" tools/build/v2/tools/gcc.jam
-
-# cleanup -g switch to avoid override debuginfocflags.
-%{__sed} -i 's/<debug-symbols>on : -g/<debug-symbols>on :/' tools/build/v2/tools/gcc.jam
-# link against shared expat library.
-%{__sed} -i 's:find-static:find-shared:' libs/graph/build/Jamfile.v2
+%patch203 -p0
+%patch221 -p1
-cat << EOF > tools/build/v2/user-config.jam
-using gcc : %(%{__cxx} -dumpversion) : %{__cxx} ;
+cat << EOF > tools/build/src/user-config.jam
+using gcc : %{cxx_version} : %{__cxx} : <cflags>"%{rpmcflags} -fPIC" <cxxflags>"%{rpmcxxflags} -fPIC" <linkflags>"%{rpmldflags}" ;
EOF
+# cleanup backups after patching
+find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+
%build
-%if %{with python}
-PYTHON_VERSION=$(%{__python} -c 'import sys; print sys.version[0:3]')
-PYTHON_ROOT=%{_prefix}
-%else
-PYTHON_ROOT=
-PYTHON_VERSION=
-%endif
EXPAT_INCLUDE=%{_includedir} \
EXPAT_LIBPATH=%{_libdir} \
ICU_PATH=%{_prefix} \
-./bootstrap.sh --prefix=%{_prefix}
+./bootstrap.sh \
+ --prefix=%{_prefix} \
+ -without-libraries=python
+
./b2 \
-d2 --toolset=gcc \
- variant=release debug-symbols=on inlining=on link=static,shared threading=multi
+ variant=release \
+ debug-symbols=on \
+ inlining=on \
+ link=static,shared \
+ threading=multi
+
+%if %{with python3}
+echo "using python : %{py3_ver}m : %{py3_prefix} : %{py3_incdir} ;" >> project-config.jam
+./b2 \
+ --with-python python=%{py3_ver}m \
+ -a -d2 --toolset=gcc \
+ variant=release \
+ debug-symbols=on \
+ inlining=on \
+ link=static,shared \
+ threading=multi
+%endif
+
+%if %{with python2}
+echo "using python : %{py_ver} : %{py_prefix} : %{py_incdir} ;" >> project-config.jam
+./b2 \
+ --with-python python=%{py_ver} \
+ -a -d2 --toolset=gcc \
+ variant=release \
+ debug-symbols=on \
+ inlining=on \
+ link=static,shared \
+ threading=multi
+%endif
%install
rm -rf $RPM_BUILD_ROOT
%post chrono -p /sbin/ldconfig
%postun chrono -p /sbin/ldconfig
+%post context -p /sbin/ldconfig
+%postun context -p /sbin/ldconfig
+
%post date_time -p /sbin/ldconfig
%postun date_time -p /sbin/ldconfig
%post python -p /sbin/ldconfig
%postun python -p /sbin/ldconfig
+%post python3 -p /sbin/ldconfig
+%postun python3 -p /sbin/ldconfig
+
%post program_options -p /sbin/ldconfig
%postun program_options -p /sbin/ldconfig
%post test -p /sbin/ldconfig
%postun test -p /sbin/ldconfig
-%post wave -p /sbin/ldconfig
-%postun wave -p /sbin/ldconfig
+%post thread -p /sbin/ldconfig
+%postun thread -p /sbin/ldconfig
%post timer -p /sbin/ldconfig
%postun timer -p /sbin/ldconfig
-%post thread -p /sbin/ldconfig
-%postun thread -p /sbin/ldconfig
+%post wave -p /sbin/ldconfig
+%postun wave -p /sbin/ldconfig
%files
%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libboost_atomic.so.*.*.*
+%attr(755,root,root) %{_libdir}/libboost_container.so.*.*.*
+%attr(755,root,root) %{_libdir}/libboost_coroutine.so.*.*.*
%attr(755,root,root) %{_libdir}/libboost_iostreams.so.*.*.*
%attr(755,root,root) %{_libdir}/libboost_math_*.so.*.*.*
%attr(755,root,root) %{_libdir}/libboost_random.so.*.*.*
%attr(755,root,root) %{_libdir}/libboost_serialization.so.*.*.*
+%attr(755,root,root) %{_libdir}/libboost_type_erasure.so.*.*.*
%attr(755,root,root) %{_libdir}/libboost_wserialization.so.*.*.*
%files devel
%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libboost_atomic.so
%attr(755,root,root) %{_libdir}/libboost_chrono.so
+%attr(755,root,root) %{_libdir}/libboost_container.so
+%attr(755,root,root) %{_libdir}/libboost_context.so
+%attr(755,root,root) %{_libdir}/libboost_coroutine.so
%attr(755,root,root) %{_libdir}/libboost_date_time.so
%attr(755,root,root) %{_libdir}/libboost_filesystem.so
%attr(755,root,root) %{_libdir}/libboost_graph.so
%attr(755,root,root) %{_libdir}/libboost_iostreams.so
%attr(755,root,root) %{_libdir}/libboost_locale.so
+%attr(755,root,root) %{_libdir}/libboost_log.so
+%attr(755,root,root) %{_libdir}/libboost_log_setup.so
%attr(755,root,root) %{_libdir}/libboost_math_*.so
%attr(755,root,root) %{_libdir}/libboost_prg_exec_monitor.so
%attr(755,root,root) %{_libdir}/libboost_program_options.so
%attr(755,root,root) %{_libdir}/libboost_system.so
%attr(755,root,root) %{_libdir}/libboost_thread.so
%attr(755,root,root) %{_libdir}/libboost_timer.so
+%attr(755,root,root) %{_libdir}/libboost_type_erasure.so
%attr(755,root,root) %{_libdir}/libboost_unit_test_framework.so
%attr(755,root,root) %{_libdir}/libboost_wave.so
%attr(755,root,root) %{_libdir}/libboost_wserialization.so
%files static
%defattr(644,root,root,755)
+%{_libdir}/libboost_atomic.a
%{_libdir}/libboost_chrono.a
+%{_libdir}/libboost_container.a
+%{_libdir}/libboost_context.a
+%{_libdir}/libboost_coroutine.a
%{_libdir}/libboost_date_time.a
%{_libdir}/libboost_exception.a
%{_libdir}/libboost_filesystem.a
%{_libdir}/libboost_graph.a
%{_libdir}/libboost_iostreams.a
%{_libdir}/libboost_locale.a
+%{_libdir}/libboost_log.a
+%{_libdir}/libboost_log_setup.a
%{_libdir}/libboost_math_*.a
%{_libdir}/libboost_prg_exec_monitor.a
%{_libdir}/libboost_program_options.a
%{_libdir}/libboost_test_exec_monitor.a
%{_libdir}/libboost_timer.a
%{_libdir}/libboost_thread.a
+%{_libdir}/libboost_type_erasure.a
%{_libdir}/libboost_unit_test_framework.a
%{_libdir}/libboost_wave.a
%{_libdir}/libboost_wserialization.a
-%if %{with python}
+%if %{with python2} || %{with python3}
+%files python-devel-common
+%defattr(644,root,root,755)
+%{_includedir}/boost/python
+%{_includedir}/boost/python.hpp
+%endif
+
+%if %{with python2}
%files python
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libboost_python.so.*.*.*
%files python-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libboost_python.so
-%{_includedir}/boost/python
-%{_includedir}/boost/python.hpp
%files python-static
%defattr(644,root,root,755)
%{_libdir}/libboost_python.a
%endif
+%if %{with python3}
+%files python3
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libboost_python3.so.*.*.*
+
+%files python3-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libboost_python3.so
+
+%files python3-static
+%defattr(644,root,root,755)
+%{_libdir}/libboost_python3.a
+%endif
+
%files chrono
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libboost_chrono.so.*.*.*
+%files context
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libboost_context.so.*.*.*
+
%files date_time
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libboost_date_time.so.*.*.*
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libboost_locale.so.*.*.*
+%files log
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libboost_log.so.*.*.*
+%attr(755,root,root) %{_libdir}/libboost_log_setup.so.*.*.*
+
%files program_options
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libboost_program_options.so.*.*.*
%attr(755,root,root) %{_libdir}/libboost_prg_exec_monitor.so.*.*.*
%attr(755,root,root) %{_libdir}/libboost_unit_test_framework.so.*.*.*
-%files timer
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libboost_timer.so.*.*.*
-
%files thread
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libboost_thread.so.*.*.*
+%files timer
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libboost_timer.so.*.*.*
+
%files wave
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libboost_wave.so.*.*.*
projects / packages / boost.git / blobdiff