diff --git a/_multibuild b/_multibuild index 37cda36..adbf813 100644 --- a/_multibuild +++ b/_multibuild @@ -1,3 +1,7 @@ base + extra + gnu-hpc + gnu-openmpi2-hpc + gnu-mvapich2-hpc diff --git a/baselibs.conf b/baselibs.conf index 83b30f3..79fd6e5 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,26 +1,25 @@ -libboost_atomic1_68_0 -libboost_container1_68_0 -libboost_context1_68_0 -libboost_coroutine1_68_0 -libboost_date_time1_68_0 -libboost_fiber1_68_0 -libboost_filesystem1_68_0 -libboost_graph1_68_0 -libboost_graph_parallel1_68_0 -libboost_iostreams1_68_0 -libboost_locale1_68_0 -libboost_math1_68_0 -libboost_mpi1_68_0 -libboost_test1_68_0 -libboost_program_options1_68_0 -libboost_python-py2_7-1_68_0 -libboost_python-py3-1_68_0 -libboost_random1_68_0 -libboost_serialization1_68_0 -libboost_signals1_68_0 -libboost_stacktrace1_68_0 -libboost_system1_68_0 -libboost_thread1_68_0 -libboost_type_erasure1_68_0 -libboost_wave1_68_0 -libboost_regex1_68_0 +libboost_atomic1_69_0 +libboost_container1_69_0 +libboost_context1_69_0 +libboost_coroutine1_69_0 +libboost_date_time1_69_0 +libboost_fiber1_69_0 +libboost_filesystem1_69_0 +libboost_graph1_69_0 +libboost_graph_parallel1_69_0 +libboost_iostreams1_69_0 +libboost_locale1_69_0 +libboost_math1_69_0 +libboost_mpi1_69_0 +libboost_test1_69_0 +libboost_program_options1_69_0 +libboost_python-py2_7-1_69_0 +libboost_python-py3-1_69_0 +libboost_random1_69_0 +libboost_serialization1_69_0 +libboost_stacktrace1_69_0 +libboost_system1_69_0 +libboost_thread1_69_0 +libboost_type_erasure1_69_0 +libboost_wave1_69_0 +libboost_regex1_69_0 diff --git a/boost.changes b/boost.changes index 9df53bb..4bcc155 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,69 @@ +------------------------------------------------------------------- +Fri Mar 8 14:57:09 UTC 2019 - Dominique Leuenberger + +- Do not build gnu-mvapich2-hpc and gnu-openmpi2-hpc flavors in + Staging areas. + +------------------------------------------------------------------- +Wed Mar 6 15:24:01 UTC 2019 - Adam Majer + +- Add missing build conditions for -extra flavour + +------------------------------------------------------------------- +Fri Feb 1 08:35:06 UTC 2019 - cgoll@suse.com + +- fixed hpc build for python3.7 + +------------------------------------------------------------------- +Wed Jan 23 20:23:54 UTC 2019 - cgoll@suse.com + +- added hpc modularized versions, which have a different naming + scheme so that they do not collide with existing libraries + * hpc builds miss the documentation + * three new _mulitbuild flavors which are + * gnu-hpc -> all libraries except the parallel ones + * gnu-openmpi2-hpc -> parallel versions with openmpi2 + * gnu-mvapich2-hpc -> parallel versions with mvapich2 + + +------------------------------------------------------------------- +Mon Jan 14 14:57:14 UTC 2019 - adam.majer@suse.de + +- Simplify _multibuild flavours + +------------------------------------------------------------------- +Fri Dec 14 01:26:04 UTC 2018 - adam.majer@suse.de + +- Update to version 1.69.0 + Breaking Changes: + + Logic: use explicit operator bool when available + + Boost.Signals removed + + New libraries: + * SafeNumerics: A library for guaranteed correct integer + arithmetic for C++14 and later + + Updated libraries: + Any, Asio, Assign, Beast, CircularBuffer, ConceptCheck, Context, + Core, Dynamic Bisect, Fiber, Filesystem, Flyweight, Function, + Geometry, Integer, Iostreams, Iterator, LexicalCast, Log, Math, + Mp11, MultiArray, Multi-index Containers, Multiprecision, + PolyCollection, Pool, Preprocessor, Rational, Spirit, + Stacktrace, System, Test, TypeIndex, Utility, Variant, YAP + + For complete changelog see + https://www.boost.org/users/history/version_1_69_0.html + +- python_library_name.patch: updated to leave Boost.MPI python + names unchanged. +- dynamic_linking.patch: refreshed +- baselibs.conf: updated to 1.69.0 +- cleanup spec file + * removed no-op conditionals + * appended -impl to all unversioned named Provides: to facilitate + introduction of boost-defaults. The defaults package will provide + upgrade path in Tumbleweed for -devel subpackages. + ------------------------------------------------------------------- Mon Oct 1 12:36:07 UTC 2018 - schwab@suse.de diff --git a/boost.spec b/boost.spec index eeafda5..dd00b9b 100644 --- a/boost.spec +++ b/boost.spec @@ -1,7 +1,7 @@ # # spec file for package boost # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,30 +12,94 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define ver 1.68.0 -%define file_version 1_68_0 +%define ver 1.69.0 +%define _ver 1_69_0 +%define package_version 1_69 +%define file_version %_ver +%define lib_appendix %_ver %define docs_version 1.56.0 %define short_version 1_56 -%define lib_appendix 1_68_0 +%define pname boost %bcond_with build_docs %bcond_without package_pdf %bcond_without build_quickbook %bcond_with boost_devel -%define my_docdir %{_docdir}/boost-%{version} +%bcond_with ringdisabled + +%define package_name boost%{library_version} +%define my_docdir %{_docdir}/boost%{library_version} + %if 0%{?suse_version} < 1500 - %define python2_sitearch %python_sitearch + %define python2_sitearch %{python_sitearch} +%endif + +%if "@BUILD_FLAVOR@" == "%nil" +%define build_base 0 +%define name_suffix %{nil} +ExclusiveArch: do_not_build %endif %if "@BUILD_FLAVOR@" == "base" %define build_base 1 %define name_suffix -base -%else +%bcond_with hpc +%endif + +%if "@BUILD_FLAVOR@" == "extra" %define build_base 0 -%define name_suffix %nil +%define name_suffix -extra +%bcond_without python3 +%bcond_without python2 +%endif + +%if "@BUILD_FLAVOR@" == "gnu-hpc" +%define build_base 1 +%define name_suffix hpc +%define compiler_family gnu +%undefine c_f_ver +%bcond_with mpi +%bcond_without hpc +#ExcludeArch: %%arm s390x i586 +ExcludeArch: s390x %{ix86} ppc64 ppc64le +%endif + +%if "@BUILD_FLAVOR@" == "gnu-openmpi2-hpc" +%define build_base 0 +%define name_suffix openmpi2_hpc +%define mpi_vers 2 +%define compiler_family gnu +%define mpi_flavor openmpi +%undefine c_f_ver +%bcond_without hpc +%bcond_without mpi +%bcond_without python2 +%bcond_without python3 +%if %{with ringdisabled} +ExclusiveArch: do-not-build +%else +ExcludeArch: s390x %{ix86} ppc64 ppc64le +%endif +%endif + +%if "@BUILD_FLAVOR@" == "gnu-mvapich2-hpc" +%define build_base 0 +%define name_suffix mvapich2_hpc +%define compiler_family gnu +%define mpi_flavor mvapich2 +%undefine c_f_ver +%bcond_without hpc +%bcond_without mpi +%bcond_without python2 +%bcond_without python3 +%if %{with ringdisabled} +ExclusiveArch: do-not-build +%else +ExcludeArch: s390x %{ix86} ppc64 ppc64le +%endif %endif # Build with OpenMPI @@ -50,16 +114,11 @@ # Keep OpenMPI1 for older releases where OpenMPI2 is not available %define mpi_implem openmpi %endif - %ifarch ia64 hppa %bcond_with build_mpi %else %bcond_without build_mpi %endif - -%bcond_without python3 -%bcond_without python2 - # Python NumPy library is only available on Leap 42.1 OpenSUSE onward # and is not availble in SLE %if 0%{?suse_version} >= 1330 || 0%{?is_opensuse} @@ -67,13 +126,32 @@ %else %bcond_with python_numpy %endif - # context hasn't been ported to most architectures yet -%ifarch %ix86 x86_64 %arm aarch64 mips ppc ppc64 ppc64le +%ifarch %{ix86} x86_64 %{arm} aarch64 mips ppc ppc64 ppc64le %bcond_without build_context %else %bcond_with build_context %endif +%if %{with hpc} +# needed by the hpc tools +%{hpc_init -c %compiler_family %{?with_mpi:-m %mpi_flavor} %{?c_f_ver:-v %{c_f_ver}} %{?mpi_vers:-V %{mpi_vers}} %{?ext:-e %{ext}}} +%define package_prefix %{hpc_prefix} +%define package_libdir %{hpc_libdir} +%define package_bindir %{hpc_bindir} +%define package_includedir %{hpc_includedir} +%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 +%else +%define package_prefix %{_prefix} +%define package_bindir %{_bindir} +%define package_libdir %{_libdir} +%define package_includedir %{_includedir} +%define base_name boost%{name_suffix} +%define package_python2_sitearch %python2_sitearch +%define package_python3_sitearch %python3_sitearch +%endif # needs newer *default* GCC to compile runtime %if %{with build_context} && 0%{?suse_version} > 1320 @@ -82,19 +160,19 @@ %bcond_with boost_fiber %endif -Name: boost%name_suffix -%define package_name boost_1_68 -Version: 1.68.0 +Name: %{base_name} +Version: 1.69.0 Release: 0 +%define library_version 1_69_0 + Summary: Boost C++ Libraries License: BSL-1.0 Group: Development/Libraries/C and C++ -Url: http://www.boost.org -Source0: http://downloads.sourceforge.net/project/boost/boost/%{version}/boost_%{file_version}.tar.bz2 +URL: http://www.boost.org +Source0: http://downloads.sourceforge.net/project/boost/boost/%{version}/boost_%{library_version}.tar.bz2 Source1: boost-rpmlintrc -Source3: http://downloads.sourceforge.net/project/boost/boost-docs/%{docs_version}/boost_%{short_version}_pdf.tar.bz2 +Source3: http://downloads.sourceforge.net/project/boost/boost-docs/1.56.0/boost_1_56_pdf.tar.bz2 Source4: existing_extra_docs -#Source5: NEWS Source10: exception.objdump Source11: __init__.py Source100: baselibs.conf @@ -126,7 +204,7 @@ BuildRequires: gcc-c++ > 5 %else BuildRequires: gcc-c++ %endif -%if ! %build_base +%if ! %{build_base} BuildRequires: dos2unix %if %{with python2} BuildRequires: python2-devel @@ -155,7 +233,17 @@ BuildRequires: libxslt-tools BuildRequires: texlive-latex %endif %endif # ! build_base -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %{with hpc} +BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel +BuildRequires: lua-lmod +BuildRequires: python +BuildRequires: suse-hpc +%hpc_requires +%if %{with mpi} +BuildRequires: %{mpi_flavor}%{?mpi_vers}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel +Requires: %{mpi_flavor}%{?mpi_vers}-%{compiler_family}%{?c_f_ver}-hpc +%endif +%endif %description Boost provides free peer-reviewed portable C++ source libraries. The @@ -170,23 +258,20 @@ Although Boost was begun by members of the C++ Standards Committee Library Working Group, membership has expanded to include nearly two thousand members of the C++ community at large. -# %%if %%build_base -%package -n libboost_headers%{lib_appendix}-devel +%package -n libboost_headers%{library_version}-devel Summary: Development headers for Boost Group: Development/Libraries/C and C++ -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} Requires: libstdc++-devel -Provides: libboost_headers-devel = %{version} -%if 0%{without boost_devel} -Provides: boost-devel = %{version} -%endif -Conflicts: otherproviders(libboost_headers-devel) Conflicts: boost-devel < 1.63 +Conflicts: libboost_headers-devel < 1.69 +Conflicts: libboost_headers-devel-impl +Provides: libboost_headers-devel-impl = %{version} -%description -n libboost_headers%{lib_appendix}-devel +%description -n libboost_headers%{library_version}-devel A collection of header-only libraries for Boost. -%package -n boost-license%{lib_appendix} +%package -n boost-license%{library_version} Summary: Boost License Group: Development/Libraries/C and C++ Provides: boost-license = %{version}-%{release} @@ -194,70 +279,104 @@ Provides: boost-license = %{version}-%{release} BuildArch: noarch %endif -%description -n boost-license%{lib_appendix} +%description -n boost-license%{library_version} This package contains the license boost is provided under. -%if %{with boost_devel} %package -n %{package_name}-devel Summary: Development package for Boost C++ Group: Development/Libraries/C and C++ -Requires: libboost_atomic%{lib_appendix}-devel -Requires: libboost_chrono%{lib_appendix}-devel -Requires: libboost_container%{lib_appendix}-devel +%if %{with hpc} +Requires: %{package_name} +%else +Requires: libboost_atomic%{library_version}-devel +Requires: libboost_chrono%{library_version}-devel +Requires: libboost_container%{library_version}-devel +Requires: libboost_date_time%{library_version}-devel +Requires: libboost_filesystem%{library_version}-devel +Requires: libboost_graph%{library_version}-devel +Requires: libboost_iostreams%{library_version}-devel +Requires: libboost_locale%{library_version}-devel +Requires: libboost_log%{library_version}-devel +Requires: libboost_math%{library_version}-devel +Requires: libboost_program_options%{library_version}-devel +Requires: libboost_random%{library_version}-devel +Requires: libboost_regex%{library_version}-devel +Requires: libboost_serialization%{library_version}-devel +Requires: libboost_system%{library_version}-devel +Requires: libboost_test%{library_version}-devel +Requires: libboost_thread%{library_version}-devel +Requires: libboost_timer%{library_version}-devel +Requires: libboost_type_erasure%{library_version}-devel +Requires: libboost_wave%{library_version}-devel +Requires: libstdc++-devel +Conflicts: boost-devel-impl +Provides: boost-devel-impl = %{version} %if %{with build_context} -Requires: libboost_context%{lib_appendix}-devel -Requires: libboost_coroutine%{lib_appendix}-devel +Requires: libboost_context%{library_version}-devel +Requires: libboost_coroutine%{library_version}-devel %endif -Requires: libboost_date_time%{lib_appendix}-devel %if %{with boost_fiber} -Requires: libboost_fiber%{lib_appendix}-devel +Requires: libboost_fiber%{library_version}-devel %endif -Requires: libboost_filesystem%{lib_appendix}-devel -Requires: libboost_graph%{lib_appendix}-devel -Requires: libboost_iostreams%{lib_appendix}-devel -Requires: libboost_locale%{lib_appendix}-devel -Requires: libboost_log%{lib_appendix}-devel -Requires: libboost_math%{lib_appendix}-devel %if %{with build_mpi} -Requires: libboost_graph_parallel%{lib_appendix}-devel -Requires: libboost_mpi%{lib_appendix}-devel +Requires: libboost_graph_parallel%{library_version}-devel +Requires: libboost_mpi%{library_version}-devel %endif -Requires: libboost_program_options%{lib_appendix}-devel %if %{with python2} -Requires: libboost_python-py2_7-%{lib_appendix}-devel +Requires: libboost_python-py2_7-%{library_version}-devel %endif %if %{with python3} -Requires: libboost_python-py3-%{lib_appendix}-devel +Requires: libboost_python-py3-%{library_version}-devel %endif -Requires: libboost_random%{lib_appendix}-devel -Requires: libboost_regex%{lib_appendix}-devel -Requires: libboost_serialization%{lib_appendix}-devel -Requires: libboost_signals%{lib_appendix}-devel -Requires: libboost_system%{lib_appendix}-devel -Requires: libboost_test%{lib_appendix}-devel -Requires: libboost_thread%{lib_appendix}-devel -Requires: libboost_timer%{lib_appendix}-devel -Requires: libboost_type_erasure%{lib_appendix}-devel -Requires: libboost_wave%{lib_appendix}-devel -Requires: libstdc++-devel -Provides: boost-devel = %version -Conflicts: otherproviders(boost-devel) - +%endif #hpc %description -n %{package_name}-devel This package contains all that is needed to develop/compile applications that use the Boost C++ libraries. For documentation see the documentation packages (html, man or pdf). -%endif # with boost_devel +%if %{with hpc} +%if ! %{with mpi} %package -n %{package_name}-jam Summary: A Boost Make Replacement Group: Development/Tools/Building -Provides: boost-jam -Conflicts: otherproviders(boost-jam) +Provides: hpc-boost-jam-impl = %{version} %description -n %{package_name}-jam Boost Jam is a build tool based on FTJam, which in turn is based on Perforce Jam. It contains significant improvements made to facilitate +its use in the Boost Build System. This version is modularized so it +does not conflict with other versions, but the module must be used +before usage. +%endif # ! mpi +%package -n %{package_name}-python3 +Summary: Boost.MPI Python 3.x serialization library +Group: System/Libraries +Requires: %{package_name} + +%description -n %{package_name}-python3 +This package contains the Boost.MPI Python 3.x serialization +inteface. +%package -n %{package_name}-python2 +Summary: Boost.MPI Python 2.x serialization library +Group: System/Libraries +Requires: %{package_name} + +%description -n %{package_name}-python2 +This package contains the Boost.MPI Python 2.x serialization +inteface. + + +%endif # hpc + +%package -n boost%{library_version}-jam +Summary: A Boost Make Replacement +Group: Development/Tools/Building +Conflicts: boost-jam-impl +Provides: boost-jam-impl = %{version} + +%description -n boost%{library_version}-jam +Boost Jam is a build tool based on FTJam, which in turn is based on +Perforce Jam. It contains significant improvements made to facilitate its use in the Boost Build System. %package -n %{package_name}-doc-html @@ -271,7 +390,6 @@ BuildArch: noarch This package contains the documentation of the boost dynamic libraries in HTML format. -%if %{with build_docs} %package doc-man Summary: Man documentation for the Boost C++ Libraries Group: Development/Libraries/C and C++ @@ -282,9 +400,7 @@ BuildArch: noarch %description doc-man This package contains the documentation of the boost dynamic libraries as man pages. -%endif -%if %{with package_pdf} %package -n %{package_name}-doc-pdf Summary: PDF documentation for the Boost C++ Libraries Group: Development/Libraries/C and C++ @@ -295,53 +411,52 @@ BuildArch: noarch %description -n %{package_name}-doc-pdf This package contains the documentation of the boost dynamic libraries in PDF format. -%endif -%package -n libboost_atomic%{lib_appendix} +%package -n libboost_atomic%{library_version} Summary: Boost.Atomic runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_atomic%{lib_appendix} +%description -n libboost_atomic%{library_version} Run-Time support for Boost.Atomic, a library that provides atomic data types and operations on these data types, as well as memory ordering constraints required for coordinating multiple threads through atomic variables. -%package -n libboost_atomic%{lib_appendix}-devel +%package -n libboost_atomic%{library_version}-devel Summary: Development headers for Boost.Atomic Group: Development/Libraries/C and C++ -Requires: libboost_atomic%{lib_appendix} = %{version} -Requires: libboost_headers%{lib_appendix}-devel = %{version} +Requires: libboost_atomic%{library_version} = %{version} +Requires: libboost_headers%{library_version}-devel = %{version} Requires: libstdc++-devel -Provides: libboost_atomic-devel = %{version} -Conflicts: otherproviders(libboost_atomic-devel) Conflicts: boost-devel < 1.63 +Conflicts: libboost_atomic-devel-impl +Provides: libboost_atomic-devel-impl = %{version} -%description -n libboost_atomic%{lib_appendix}-devel +%description -n libboost_atomic%{library_version}-devel Development support for Boost.Atomic, a library that provides atomic data types and operations on these data types, as well as memory ordering constraints required for coordinating multiple threads through atomic variables. -%package -n libboost_container%{lib_appendix} +%package -n libboost_container%{library_version} Summary: Boost.Container runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_container%{lib_appendix} +%description -n libboost_container%{library_version} This package contains the Boost.Container runtime library. -%package -n libboost_container%{lib_appendix}-devel +%package -n libboost_container%{library_version}-devel Summary: Development headers for Boost.Container Group: Development/Libraries/C and C++ -Requires: libboost_container%{lib_appendix} = %{version} -Requires: libboost_headers%{lib_appendix}-devel = %{version} +Requires: libboost_container%{library_version} = %{version} +Requires: libboost_headers%{library_version}-devel = %{version} Requires: libstdc++-devel -Provides: libboost_container-devel = %{version} -Conflicts: otherproviders(libboost_container-devel) Conflicts: boost-devel < 1.63 +Conflicts: libboost_container-devel-impl +Provides: libboost_container-devel-impl = %{version} -%description -n libboost_container%{lib_appendix}-devel +%description -n libboost_container%{library_version}-devel Development header files and libraries for Boost.Container. Boost.Container library implements several well-known containers, including STL containers. The aim of the library is to offers advanced @@ -349,768 +464,733 @@ features not present in standard containers or to offer the latest standard draft features for compilers that don't comply with the latest C++ standard. -%package -n libboost_context%{lib_appendix} +%package -n libboost_context%{library_version} Summary: Boost.Context runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_context%{lib_appendix} +%description -n libboost_context%{library_version} Runtime support for Boost.Context, a library that providing cooperative multitasking support. -%package -n libboost_context%{lib_appendix}-devel +%package -n libboost_context%{library_version}-devel Summary: Development headers for Boost.Context Group: Development/Libraries/C and C++ -Requires: libboost_context%{lib_appendix} = %{version} -Requires: libboost_headers%{lib_appendix}-devel = %{version} +Requires: libboost_context%{library_version} = %{version} +Requires: libboost_headers%{library_version}-devel = %{version} Requires: libstdc++-devel -Provides: libboost_context-devel = %{version} -Conflicts: otherproviders(libboost_context-devel) Conflicts: boost-devel < 1.63 +Conflicts: libboost_context-devel-impl +Provides: libboost_context-devel-impl = %{version} -%description -n libboost_context%{lib_appendix}-devel +%description -n libboost_context%{library_version}-devel Development headers and libraries for Boost.Context, a library that providing cooperative multitasking support. -%package -n libboost_contract%{lib_appendix} +%package -n libboost_contract%{library_version} Summary: Boost.Contract runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_contract%{lib_appendix} +%description -n libboost_contract%{library_version} Runtime support for Boost.Contract, a library that implements Design by Contract or DbC or contract programming. -%package -n libboost_contract%{lib_appendix}-devel +%package -n libboost_contract%{library_version}-devel Summary: Development headers for Boost.Contract Group: Development/Libraries/C and C++ -Requires: libboost_contract%{lib_appendix} = %{version} -Requires: libboost_headers%{lib_appendix}-devel = %{version} +Requires: libboost_contract%{library_version} = %{version} +Requires: libboost_headers%{library_version}-devel = %{version} Requires: libstdc++-devel -Provides: libboost_contract-devel = %{version} -Conflicts: otherproviders(libboost_contract-devel) +Conflicts: libboost_contract-devel-impl +Provides: libboost_contract-devel-impl = %{version} -%description -n libboost_contract%{lib_appendix}-devel +%description -n libboost_contract%{library_version}-devel Development headers and libraries for Boost.Contract, a library that implements Design by Contract or DbC or contract programming. -%package -n libboost_coroutine%{lib_appendix} +%package -n libboost_coroutine%{library_version} Summary: Boost::Coroutine runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_coroutine%{lib_appendix} +%description -n libboost_coroutine%{library_version} This package contains the Boost Coroutine runtime library. -%package -n libboost_coroutine%{lib_appendix}-devel +%package -n libboost_coroutine%{library_version}-devel Summary: Development headers for Boost.Coroutine Group: Development/Libraries/C and C++ -Requires: libboost_context%{lib_appendix}-devel = %{version} -Requires: libboost_coroutine%{lib_appendix} = %{version} -Requires: libboost_headers%{lib_appendix}-devel = %{version} +Requires: libboost_context%{library_version}-devel = %{version} +Requires: libboost_coroutine%{library_version} = %{version} +Requires: libboost_headers%{library_version}-devel = %{version} Requires: libstdc++-devel -Provides: libboost_coroutine-devel = %{version} -Conflicts: otherproviders(libboost_coroutine-devel) Conflicts: boost-devel < 1.63 +Conflicts: libboost_coroutine-devel-impl +Provides: libboost_coroutine-devel-impl = %{version} -%description -n libboost_coroutine%{lib_appendix}-devel +%description -n libboost_coroutine%{library_version}-devel This package provides headers for Boost.Coroutine libraries. Boost.Coroutine2 provides templates for generalized subroutines which allow suspending and resuming execution at certain locations. -%package -n libboost_date_time%{lib_appendix} +%package -n libboost_date_time%{library_version} Summary: Boost.DateTime runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_date_time%{lib_appendix} +%description -n libboost_date_time%{library_version} This package contains the Boost Date.DateTime runtime libraries. -%package -n libboost_date_time%{lib_appendix}-devel +%package -n libboost_date_time%{library_version}-devel Summary: Development headers for Boost.DateTime library Group: Development/Libraries/C and C++ -Requires: libboost_date_time%{lib_appendix} = %{version} -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Recommends: libboost_serialization%{lib_appendix}-devel = %{version} +Requires: libboost_date_time%{library_version} = %{version} +Requires: libboost_headers%{library_version}-devel = %{version} Requires: libstdc++-devel -Provides: libboost_date_time-devel = %{version} -Conflicts: otherproviders(libboost_date_time-devel) +Recommends: libboost_serialization%{library_version}-devel = %{version} Conflicts: boost-devel < 1.63 +Conflicts: libboost_date_time-devel-impl +Provides: libboost_date_time-devel-impl = %{version} -%description -n libboost_date_time%{lib_appendix}-devel +%description -n libboost_date_time%{library_version}-devel This package contains development header files and libraries for Boost.DateTime library. -%package -n libboost_fiber%{lib_appendix} +%package -n libboost_fiber%{library_version} Summary: Boost.Fiber runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_fiber%{lib_appendix} +%description -n libboost_fiber%{library_version} This package contains Boost.Fiber runtime library. -%package -n libboost_fiber%{lib_appendix}-devel +%package -n libboost_fiber%{library_version}-devel Summary: Development headers for Boost.Fiber library Group: Development/Libraries/C and C++ -Requires: libboost_context%{lib_appendix}-devel = %{version} -Requires: libboost_fiber%{lib_appendix} = %{version} -Requires: libboost_headers%{lib_appendix}-devel = %{version} +Requires: libboost_context%{library_version}-devel = %{version} +Requires: libboost_fiber%{library_version} = %{version} +Requires: libboost_headers%{library_version}-devel = %{version} Requires: libstdc++-devel -Provides: libboost_fiber-devel = %{version} -Conflicts: otherproviders(libboost_fiber-devel) Conflicts: boost-devel < 1.63 +Conflicts: libboost_fiber-devel-impl +Provides: libboost_fiber-devel-impl = %{version} -%description -n libboost_fiber%{lib_appendix}-devel +%description -n libboost_fiber%{library_version}-devel This package contains development header files and libraries for Boost.Fiber library. Boost.Fiber is a cooperative multi-tasking userland threading library. -%package -n libboost_filesystem%{lib_appendix} +%package -n libboost_filesystem%{library_version} Summary: Boost.Filesystem Runtime Libraries Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_filesystem%{lib_appendix} +%description -n libboost_filesystem%{library_version} This package contains the Boost.Filesystem library. -%package -n libboost_filesystem%{lib_appendix}-devel +%package -n libboost_filesystem%{library_version}-devel Summary: Development headers for Boost.Filesystem library Group: Development/Libraries/C and C++ -Requires: libboost_filesystem%{lib_appendix} = %{version} -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Requires: libboost_system%{lib_appendix}-devel = %{version} +Requires: libboost_filesystem%{library_version} = %{version} +Requires: libboost_headers%{library_version}-devel = %{version} Requires: libstdc++-devel -Provides: libboost_filesystem-devel = %{version} -Conflicts: otherproviders(libboost_filesystem-devel) Conflicts: boost-devel < 1.63 +Conflicts: libboost_filesystem-devel-impl +Provides: libboost_filesystem-devel-impl = %{version} -%description -n libboost_filesystem%{lib_appendix}-devel +%description -n libboost_filesystem%{library_version}-devel Development headers for Boost.Filesystem library, a library providing facilities to manipulate files and directories, and the paths that identify them. -%package -n libboost_graph%{lib_appendix} +%package -n libboost_graph%{library_version} Summary: Boost.Graph runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_graph%{lib_appendix} +%description -n libboost_graph%{library_version} This package contains the Boost.Graph runtime library. -%package -n libboost_graph%{lib_appendix}-devel +%package -n libboost_graph%{library_version}-devel Summary: Development headers for Boost.Graph library Group: Development/Libraries/C and C++ -Requires: libboost_graph%{lib_appendix} = %{version} -Requires: libboost_headers%{lib_appendix}-devel = %{version} +Requires: libboost_graph%{library_version} = %{version} +Requires: libboost_headers%{library_version}-devel = %{version} ## FIXME:!!!! need better list of requirements here Requires: libstdc++-devel -Provides: libboost_graph-devel = %{version} -Conflicts: otherproviders(libboost_graph-devel) Conflicts: boost-devel < 1.63 +Conflicts: libboost_graph-devel-impl +Provides: libboost_graph-devel-impl = %{version} -%description -n libboost_graph%{lib_appendix}-devel +%description -n libboost_graph%{library_version}-devel Development headers for Boost.Graph library. The BGL algorithms consist of a core set of algorithm patterns and a larger set of graph algorithms. The core algorithm patterns are Breadth First Search, Depth First Search, and Uniform Cost Search. - -%package -n libboost_iostreams%{lib_appendix} +%package -n libboost_iostreams%{library_version} Summary: Boost.IOStreams Runtime Libraries Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_iostreams%{lib_appendix} +%description -n libboost_iostreams%{library_version} This package contains the Boost.IOStreams Runtime libraries. -%package -n libboost_iostreams%{lib_appendix}-devel +%package -n libboost_iostreams%{library_version}-devel Summary: Development headers for Boost.IOStreans library Group: Development/Libraries/C and C++ -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Requires: libboost_iostreams%{lib_appendix} = %{version} -Provides: libboost_iostreams-devel = %{version} -Conflicts: otherproviders(libboost_iostreams-devel) +Requires: libboost_headers%{library_version}-devel = %{version} +Requires: libboost_iostreams%{library_version} = %{version} Conflicts: boost-devel < 1.63 +Conflicts: libboost_iostreams-devel-impl +Provides: libboost_iostreams-devel-impl = %{version} -%description -n libboost_iostreams%{lib_appendix}-devel +%description -n libboost_iostreams%{library_version}-devel Boost.IOStreams provides a framework for defining streams, stream buffers and IO filters -%package -n libboost_log%{lib_appendix} +%package -n libboost_log%{library_version} Summary: Boost.Log runtime Run-Time library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_log%{lib_appendix} +%description -n libboost_log%{library_version} This package contains runtime library for Boost.Log. -%package -n libboost_log%{lib_appendix}-devel +%package -n libboost_log%{library_version}-devel Summary: Development headers for Boost.Log library Group: Development/Libraries/C and C++ -Requires: libboost_date_time%{lib_appendix}-devel = %{version} -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Requires: libboost_log%{lib_appendix} = %{version} -Requires: libboost_system%{lib_appendix} = %{version} -Requires: libboost_thread%{lib_appendix} = %{version} -Provides: libboost_log-devel = %{version} -Conflicts: otherproviders(libboost_log-devel) +Requires: libboost_date_time%{library_version}-devel = %{version} +Requires: libboost_headers%{library_version}-devel = %{version} +Requires: libboost_log%{library_version} = %{version} +Requires: libboost_thread%{library_version} = %{version} Conflicts: boost-devel < 1.63 +Conflicts: libboost_log-devel-impl +Provides: libboost_log-devel-impl = %{version} -%description -n libboost_log%{lib_appendix}-devel +%description -n libboost_log%{library_version}-devel Development headers for Boost.Log library which aims to make logging significantly easier for the application developer. It provides a wide range of out-of-the-box tools along with public interfaces for extending the library. -%package -n libboost_math%{lib_appendix} +%package -n libboost_math%{library_version} Summary: Boost.Math runtime libraries Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_math%{lib_appendix} +%description -n libboost_math%{library_version} This package contains the Boost.Math Runtime libraries. -%package -n libboost_math%{lib_appendix}-devel +%package -n libboost_math%{library_version}-devel Summary: Development headers for Boost.Math libraries Group: Development/Libraries/C and C++ -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Requires: libboost_math%{lib_appendix} = %{version} -Provides: libboost_math-devel = %{version} -Conflicts: otherproviders(libboost_math-devel) +Requires: libboost_headers%{library_version}-devel = %{version} +Requires: libboost_math%{library_version} = %{version} Conflicts: boost-devel < 1.63 +Conflicts: libboost_math-devel-impl +Provides: libboost_math-devel-impl = %{version} -%description -n libboost_math%{lib_appendix}-devel +%description -n libboost_math%{library_version}-devel Development headers for Boost.Math* boost libraries. -%if %{with build_mpi} -%package -n libboost_mpi%{lib_appendix} +%package -n libboost_mpi%{library_version} Summary: Boost.MPI runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_mpi%{lib_appendix} +%description -n libboost_mpi%{library_version} This package contains the Boost.MPI runtime library. -%package -n libboost_mpi%{lib_appendix}-devel +%package -n libboost_mpi%{library_version}-devel Summary: Development headers for Boost.MPI library Group: Development/Libraries/C and C++ -Requires: libboost_graph%{lib_appendix}-devel -Requires: libboost_headers%{lib_appendix}-devel = %{version} +Requires: %{mpi_implem}-devel +Requires: libboost_graph%{library_version}-devel +Requires: libboost_headers%{library_version}-devel = %{version} +Requires: libboost_mpi%{library_version} = %{version} +Requires: libboost_serialization%{library_version}-devel +Conflicts: boost-devel < 1.63 +Conflicts: libboost_mpi-devel-impl +Provides: libboost_mpi-devel-impl = %{version} %if %{with python2} -Requires: libboost_python-py2_7-%{lib_appendix}-devel +Requires: libboost_python-py2_7-%{library_version}-devel %endif %if %{with python3} -Requires: libboost_python-py3-%{lib_appendix}-devel +Requires: libboost_python-py3-%{library_version}-devel %endif -Requires: %{mpi_implem}-devel -Requires: libboost_mpi%{lib_appendix} = %{version} -Requires: libboost_serialization%{lib_appendix}-devel -Provides: libboost_mpi-devel = %{version} -Conflicts: otherproviders(libboost_mpi-devel) -Conflicts: boost-devel < 1.63 -%description -n libboost_mpi%{lib_appendix}-devel +%description -n libboost_mpi%{library_version}-devel Development headers for Boost.MPI boost library -%package -n libboost_graph_parallel%{lib_appendix} +%package -n libboost_graph_parallel%{library_version} Summary: Boost.Graph.Distributed runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_graph_parallel%{lib_appendix} +%description -n libboost_graph_parallel%{library_version} This package contains the Boost.Graph parallel runtime library -%package -n libboost_graph_parallel%{lib_appendix}-devel +%package -n libboost_graph_parallel%{library_version}-devel Summary: Development headers for Boost.Graph parallel library Group: Development/Libraries/C and C++ -Requires: libboost_graph_parallel%{lib_appendix} = %{version} -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Requires: libboost_mpi%{lib_appendix}-devel = %{version} -Provides: libboost_graph_parallel-devel = %{version} -Conflicts: otherproviders(libboost_graph_parallel-devel) +Requires: libboost_graph_parallel%{library_version} = %{version} +Requires: libboost_headers%{library_version}-devel = %{version} +Requires: libboost_mpi%{library_version}-devel = %{version} Conflicts: boost-devel < 1.63 +Conflicts: libboost_graph_parallel-devel-impl +Provides: libboost_graph_parallel-devel-impl = %{version} -%description -n libboost_graph_parallel%{lib_appendix}-devel +%description -n libboost_graph_parallel%{library_version}-devel Development headers for Boost.Graph parallel boost library. -%if %{with python2} -%package -n libboost_mpi_python-py2_7-%{lib_appendix} +%package -n libboost_mpi_python-py2_7-%{library_version} Summary: Boost.MPI Python serialization library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_mpi_python-py2_7-%{lib_appendix} +%description -n libboost_mpi_python-py2_7-%{library_version} This package contains the Boost.MPI Python 2.7 serialization library -%package -n libboost_mpi_python-py2_7-%{lib_appendix}-devel +%package -n libboost_mpi_python-py2_7-%{library_version}-devel Summary: Development library for Boost.MPI Python 2.7 serialization Group: Development/Libraries/C and C++ -Requires: libboost_mpi%{lib_appendix}-devel = %{version} -Requires: libboost_mpi_python-py2_7-%{lib_appendix} = %{version} -Requires: libboost_python-py2_7-%{lib_appendix} = %{version} -Provides: libboost_mpi_python-devel = %{version} -Conflicts: otherproviders(libboost_mpi_python-devel) +Requires: libboost_mpi%{library_version}-devel = %{version} +Requires: libboost_mpi_python-py2_7-%{library_version} = %{version} +Requires: libboost_python-py2_7-%{library_version} = %{version} Conflicts: boost-devel < 1.63 +Conflicts: libboost_mpi_python-devel-impl +Provides: libboost_mpi_python-devel-impl = %{version} -%description -n libboost_mpi_python-py2_7-%{lib_appendix}-devel +%description -n libboost_mpi_python-py2_7-%{library_version}-devel This package contains the Boost.MPI development library for Python 2.7 serialization interface. - -%package -n python2-boost_parallel_mpi%{lib_appendix} +%package -n python2-boost_parallel_mpi%{library_version} Summary: Python 2.7 bindings for Boost.Parallel.MPI library Group: Development/Languages/Python -Provides: python-boost_parallel_mpi = %{version} -Provides: python-boost_parallel_mpi%{lib_appendix} = %{version} -Conflicts: otherproviders(python-boost_parallel_mpi) +Conflicts: python-boost_parallel_mpi-impl +Provides: python-boost_parallel_mpi%{library_version} = %{version} +Provides: python-boost_parallel_mpi-impl = %{version} -%description -n python2-boost_parallel_mpi%{lib_appendix} +%description -n python2-boost_parallel_mpi%{library_version} This package contains the Boost.Parallel.MPI bindings for Python 2.7 -%endif # python2 - -%if %{with python3} - -%package -n libboost_mpi_python-py3-%{lib_appendix} +%package -n libboost_mpi_python-py3-%{library_version} Summary: Boost.MPI Python 3.x serialization library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_mpi_python-py3-%{lib_appendix} +%description -n libboost_mpi_python-py3-%{library_version} This package contains the Boost.MPI Python 3.x serialization inteface. -%package -n libboost_mpi_python-py3-%{lib_appendix}-devel +%package -n libboost_mpi_python-py3-%{library_version}-devel Summary: Development library for Boost.MPI Python 3.x serialization Group: Development/Libraries/C and C++ -Requires: libboost_mpi%{lib_appendix}-devel = %{version} -Requires: libboost_mpi_python-py3-%{lib_appendix} = %{version} -Requires: libboost_python-py3-%{lib_appendix} = %{version} -Provides: libboost_mpi_python3-devel = %{version} -Conflicts: otherproviders(libboost_mpi_python3-devel) +Requires: libboost_mpi%{library_version}-devel = %{version} +Requires: libboost_mpi_python-py3-%{library_version} = %{version} +Requires: libboost_python-py3-%{library_version} = %{version} Conflicts: boost-devel < 1.63 +Conflicts: libboost_mpi_python3-devel-impl +Provides: libboost_mpi_python3-devel-impl = %{version} -%description -n libboost_mpi_python-py3-%{lib_appendix}-devel +%description -n libboost_mpi_python-py3-%{library_version}-devel This package contains the Boost.MPI development library for Python 3.x serialization interface -%package -n python3-boost_parallel_mpi%{lib_appendix} +%package -n python3-boost_parallel_mpi%{library_version} Summary: Python 3.x bindings for Boost.Parallel.MPI library Group: Development/Languages/Python -Provides: python3-boost_parallel_mpi = %{version} -Conflicts: otherproviders(python3-boost_parallel_mpi) +Conflicts: python3-boost_parallel_mpi-impl +Provides: python3-boost_parallel_mpi-impl = %{version} -%description -n python3-boost_parallel_mpi%{lib_appendix} +%description -n python3-boost_parallel_mpi%{library_version} This package contains the Boost.Parallel.MPI bindings for Python 3.x -%endif # python3 -%endif # mpi - -%package -n libboost_test%{lib_appendix} +%package -n libboost_test%{library_version} Summary: Boost.Test runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_test%{lib_appendix} +%description -n libboost_test%{library_version} This package contains the BoosttTest runtime library. -%package -n libboost_test%{lib_appendix}-devel +%package -n libboost_test%{library_version}-devel Summary: Development headers for Boost.Test library Group: Development/Libraries/C and C++ -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Requires: libboost_test%{lib_appendix} = %{version} -Provides: libboost_test-devel = %{version} -Conflicts: otherproviders(libboost_test-devel) +Requires: libboost_headers%{library_version}-devel = %{version} +Requires: libboost_test%{library_version} = %{version} Conflicts: boost-devel < 1.63 +Conflicts: libboost_test-devel-impl +Provides: libboost_test-devel-impl = %{version} -%description -n libboost_test%{lib_appendix}-devel +%description -n libboost_test%{library_version}-devel Development headers for Boost.Test library. Boost.Test supports for simple program testing, full unit testing, and for program execution monitoring. -%package -n libboost_program_options%{lib_appendix} +%package -n libboost_program_options%{library_version} Summary: Boost.ProgramOptions runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_program_options%{lib_appendix} +%description -n libboost_program_options%{library_version} This package contains the Boost.ProgramOptions runtime library. -%package -n libboost_program_options%{lib_appendix}-devel +%package -n libboost_program_options%{library_version}-devel Summary: Development headers for Boost.ProgramOptions library Group: Development/Libraries/C and C++ -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Requires: libboost_program_options%{lib_appendix} = %{version} -Provides: libboost_program_options-devel = %{version} -Conflicts: otherproviders(libboost_program_options-devel) +Requires: libboost_headers%{library_version}-devel = %{version} +Requires: libboost_program_options%{library_version} = %{version} Conflicts: boost-devel < 1.63 +Conflicts: libboost_program_options-devel-impl +Provides: libboost_program_options-devel-impl = %{version} -%description -n libboost_program_options%{lib_appendix}-devel +%description -n libboost_program_options%{library_version}-devel This package contains development headers for Boost.ProgramOptions library. -%if %{with python2} -%package -n libboost_python-py2_7-%{lib_appendix} +%package -n libboost_python-py2_7-%{library_version} Summary: Boost.Python runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_python-py2_7-%{lib_appendix} +%description -n libboost_python-py2_7-%{library_version} This package contains the Boost::Python runtime library for default version of python. -%package -n libboost_python-py2_7-%{lib_appendix}-devel +%package -n libboost_python-py2_7-%{library_version}-devel Summary: Development headers for Boost.Python library Group: Development/Libraries/C and C++ -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Requires: libboost_python-py2_7-%{lib_appendix} = %{version} -Provides: libboost_python-devel = %{version} -Conflicts: otherproviders(libboost_python-devel) +Requires: libboost_headers%{library_version}-devel = %{version} +Requires: libboost_python-py2_7-%{library_version} = %{version} Conflicts: boost-devel < 1.63 +Conflicts: libboost_python-devel-impl +Provides: libboost_python-devel-impl = %{version} -%description -n libboost_python-py2_7-%{lib_appendix}-devel +%description -n libboost_python-py2_7-%{library_version}-devel Development headers for Boost::Python library for the default version of python. -%if %{with python_numpy} -%package -n libboost_numpy-py2_7-%{lib_appendix} +%package -n libboost_numpy-py2_7-%{library_version} Summary: Boost.Python.NumPy runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_numpy-py2_7-%{lib_appendix} +%description -n libboost_numpy-py2_7-%{library_version} This package contains the Boost::Python::NumPy runtime library for default version of python. -%package -n libboost_numpy-py2_7-%{lib_appendix}-devel +%package -n libboost_numpy-py2_7-%{library_version}-devel Summary: Development headers for Boost.Python.NumPy library Group: Development/Libraries/C and C++ -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Requires: libboost_numpy-py2_7-%{lib_appendix} = %{version} -Provides: libboost_numpy-devel = %{version} -Conflicts: otherproviders(libboost_numpy-devel) +Requires: libboost_headers%{library_version}-devel = %{version} +Requires: libboost_numpy-py2_7-%{library_version} = %{version} Conflicts: boost-devel < 1.63 +Conflicts: libboost_numpy-devel-impl +Provides: libboost_numpy-devel-impl = %{version} -%description -n libboost_numpy-py2_7-%{lib_appendix}-devel +%description -n libboost_numpy-py2_7-%{library_version}-devel Development headers for Boost::Python::NumPy library for the default version of python. -%endif # with numpy -%endif # with python2 -%if %{with python3} -%package -n libboost_python-py3-%{lib_appendix} +%package -n libboost_python-py3-%{library_version} Summary: Boost.Python runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_python-py3-%{lib_appendix} +%description -n libboost_python-py3-%{library_version} This package contains the Boost.Python runtime libraries for python3 bindings. -%package -n libboost_python-py3-%{lib_appendix}-devel +%package -n libboost_python-py3-%{library_version}-devel Summary: Development headers for Boost.Python library Group: Development/Libraries/C and C++ -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Requires: libboost_python-py3-%{lib_appendix} = %{version} -Provides: libboost_python3-devel = %{version} -Conflicts: otherproviders(libboost_python3-devel) +Requires: libboost_headers%{library_version}-devel = %{version} +Requires: libboost_python-py3-%{library_version} = %{version} Conflicts: boost-devel < 1.63 +Conflicts: libboost_python3-devel-impl +Provides: libboost_python3-devel-impl = %{version} -%description -n libboost_python-py3-%{lib_appendix}-devel +%description -n libboost_python-py3-%{library_version}-devel Development headers for Boost.Python library. This package contains library for python3 development for boost. -%if %{with python_numpy} -%package -n libboost_numpy-py3-%{lib_appendix} +%package -n libboost_numpy-py3-%{library_version} Summary: Boost.Python.NumPy runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_numpy-py3-%{lib_appendix} +%description -n libboost_numpy-py3-%{library_version} This package contains the Boost.Python.NumPy runtime libraries for python3 bindings. -%package -n libboost_numpy-py3-%{lib_appendix}-devel +%package -n libboost_numpy-py3-%{library_version}-devel Summary: Development headers for Boost.Python.NumPy library Group: Development/Libraries/C and C++ -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Requires: libboost_numpy-py3-%{lib_appendix} = %{version} -Provides: libboost_numpy3-devel = %{version} -Conflicts: otherproviders(libboost_numpy3-devel) +Requires: libboost_headers%{library_version}-devel = %{version} +Requires: libboost_numpy-py3-%{library_version} = %{version} Conflicts: boost-devel < 1.63 +Conflicts: libboost_numpy3-devel-impl +Provides: libboost_numpy3-devel-impl = %{version} -%description -n libboost_numpy-py3-%{lib_appendix}-devel +%description -n libboost_numpy-py3-%{library_version}-devel Development headers for Boost.Python.NumPy library. This package contains library for python3 development for boost. -%endif # with numpy -%endif # with python3 - -%package -n libboost_serialization%{lib_appendix} +%package -n libboost_serialization%{library_version} Summary: Boost.Serialization runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_serialization%{lib_appendix} +%description -n libboost_serialization%{library_version} This package contains the Boost.Serialization runtime library. -%package -n libboost_serialization%{lib_appendix}-devel +%package -n libboost_serialization%{library_version}-devel Summary: Development headers for Boost.Serialization library Group: Development/Libraries/C and C++ -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Requires: libboost_serialization%{lib_appendix} = %{version} -Provides: libboost_serialization-devel = %{version} -Conflicts: otherproviders(libboost_serialization-devel) +Requires: libboost_headers%{library_version}-devel = %{version} +Requires: libboost_serialization%{library_version} = %{version} Conflicts: boost-devel < 1.63 +Conflicts: libboost_serialization-devel-impl +Provides: libboost_serialization-devel-impl = %{version} -%description -n libboost_serialization%{lib_appendix}-devel +%description -n libboost_serialization%{library_version}-devel This package contains development headers for Boost.Serialization library. -%package -n libboost_signals%{lib_appendix} -Summary: Boost.Signals runtime library -Group: System/Libraries -Requires: boost-license%{lib_appendix} - -%description -n libboost_signals%{lib_appendix} -This package contains the Boost::Signals Runtime library. - -%package -n libboost_signals%{lib_appendix}-devel -Summary: Development headers for Boost.Signals library -Group: Development/Libraries/C and C++ -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Requires: libboost_signals%{lib_appendix} = %{version} -Provides: libboost_signals-devel = %{version} -Conflicts: otherproviders(libboost_signals-devel) -Conflicts: boost-devel < 1.63 - -%description -n libboost_signals%{lib_appendix}-devel -This package contains development headers for Boost.Signals library. -Boost.Signals is deprecated in favour of Boost.Signals2, a header-only -library and part of libboost_headers-devel. - -%package -n libboost_stacktrace%{lib_appendix} +%package -n libboost_stacktrace%{library_version} Summary: Boost.Stacktrace runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_stacktrace%{lib_appendix} +%description -n libboost_stacktrace%{library_version} This package contains the Boost.Stacktrace runtime library. -%package -n libboost_stacktrace%{lib_appendix}-devel +%package -n libboost_stacktrace%{library_version}-devel Summary: Development headers for Boost.Stacktrace library Group: Development/Libraries/C and C++ -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Requires: libboost_stacktrace%{lib_appendix} = %{version} -Provides: libboost_stacktrace-devel = %{version} -Conflicts: otherproviders(libboost_stacktrace-devel) +Requires: libboost_headers%{library_version}-devel = %{version} +Requires: libboost_stacktrace%{library_version} = %{version} +Conflicts: libboost_stacktrace-devel-impl +Provides: libboost_stacktrace-devel-impl = %{version} -%description -n libboost_stacktrace%{lib_appendix}-devel +%description -n libboost_stacktrace%{library_version}-devel This package contains development headers for Boost.Stacktrace library. Boost.Stacktrace is a simple C++03 library that provide information about call sequence in a human-readable form. -%package -n libboost_system%{lib_appendix} +%package -n libboost_system%{library_version} Summary: Boost.System runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_system%{lib_appendix} -This package contains the Boost.System runtime library. +%description -n libboost_system%{library_version} +This package contains the Boost.System stub library. -%package -n libboost_system%{lib_appendix}-devel +%package -n libboost_system%{library_version}-devel Summary: Development headers for Boost.System library Group: Development/Libraries/C and C++ -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Requires: libboost_system%{lib_appendix} = %{version} -Provides: libboost_system-devel = %{version} -Conflicts: otherproviders(libboost_system-devel) +Requires: libboost_headers%{library_version}-devel = %{version} +Requires: libboost_system%{library_version} = %{version} Conflicts: boost-devel < 1.63 +Conflicts: libboost_system-devel-impl +Provides: libboost_system-devel-impl = %{version} -%description -n libboost_system%{lib_appendix}-devel -This package contains development headers for Boost.System library. +%description -n libboost_system%{library_version}-devel +This package contained Boost.System development library. It is no +longer required as the library is headers only. -%package -n libboost_thread%{lib_appendix} +%package -n libboost_thread%{library_version} Summary: Boost.Thread runtime libraries Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_thread%{lib_appendix} +%description -n libboost_thread%{library_version} This package contains the Boost.Thread runtime library. -%package -n libboost_thread%{lib_appendix}-devel +%package -n libboost_thread%{library_version}-devel Summary: Development headers for Boost.Thread library Group: Development/Libraries/C and C++ -Requires: libboost_chrono%{lib_appendix}-devel = %{version} -Requires: libboost_date_time%{lib_appendix}-devel = %{version} -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Requires: libboost_thread%{lib_appendix} = %{version} -Provides: libboost_thread-devel = %{version} -Conflicts: otherproviders(libboost_thread-devel) +Requires: libboost_chrono%{library_version}-devel = %{version} +Requires: libboost_date_time%{library_version}-devel = %{version} +Requires: libboost_headers%{library_version}-devel = %{version} +Requires: libboost_thread%{library_version} = %{version} Conflicts: boost-devel < 1.63 +Conflicts: libboost_thread-devel-impl +Provides: libboost_thread-devel-impl = %{version} -%description -n libboost_thread%{lib_appendix}-devel +%description -n libboost_thread%{library_version}-devel This package contains development headers for Boost.Thread library. -%package -n libboost_wave%{lib_appendix} +%package -n libboost_wave%{library_version} Summary: Boost.Wave runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_wave%{lib_appendix} +%description -n libboost_wave%{library_version} This package contains the Boost::Wave runtime library. -%package -n libboost_wave%{lib_appendix}-devel +%package -n libboost_wave%{library_version}-devel Summary: Development headers for Boost.Wave library Group: Development/Libraries/C and C++ -Requires: libboost_filesystem%{lib_appendix}-devel = %{version} -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Requires: libboost_serialization%{lib_appendix}-devel = %{version} -Requires: libboost_wave%{lib_appendix} = %{version} -Provides: libboost_wave-devel = %{version} -Conflicts: otherproviders(libboost_wave-devel) +Requires: libboost_filesystem%{library_version}-devel = %{version} +Requires: libboost_headers%{library_version}-devel = %{version} +Requires: libboost_serialization%{library_version}-devel = %{version} +Requires: libboost_wave%{library_version} = %{version} Conflicts: boost-devel < 1.63 +Conflicts: libboost_wave-devel-impl +Provides: libboost_wave-devel-impl = %{version} -%description -n libboost_wave%{lib_appendix}-devel +%description -n libboost_wave%{library_version}-devel This package contains development headers for Boost.Wave library. -%package -n libboost_regex%{lib_appendix} +%package -n libboost_regex%{library_version} Summary: Boost.Regex runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_regex%{lib_appendix} +%description -n libboost_regex%{library_version} This package contains the Boost.Regex runtime library. -%package -n libboost_regex%{lib_appendix}-devel +%package -n libboost_regex%{library_version}-devel Summary: Development headers for Boost.Regex library Group: Development/Libraries/C and C++ -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Requires: libboost_regex%{lib_appendix} = %{version} -Provides: libboost_regex-devel = %{version} -Conflicts: otherproviders(libboost_regex-devel) +Requires: libboost_headers%{library_version}-devel = %{version} +Requires: libboost_regex%{library_version} = %{version} Conflicts: boost-devel < 1.63 +Conflicts: libboost_regex-devel-impl +Provides: libboost_regex-devel-impl = %{version} -%description -n libboost_regex%{lib_appendix}-devel +%description -n libboost_regex%{library_version}-devel This package contains development headers for Boost.Regex library. -%package -n libboost_random%{lib_appendix} +%package -n libboost_random%{library_version} Summary: Boost.Random runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_random%{lib_appendix} +%description -n libboost_random%{library_version} This package contains the Boost.Random runtime library. -%package -n libboost_random%{lib_appendix}-devel +%package -n libboost_random%{library_version}-devel Summary: Development headers for Boost.Random library Group: Development/Libraries/C and C++ -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Requires: libboost_random%{lib_appendix} = %{version} -Provides: libboost_random-devel = %{version} -Conflicts: otherproviders(libboost_random-devel) +Requires: libboost_headers%{library_version}-devel = %{version} +Requires: libboost_random%{library_version} = %{version} Conflicts: boost-devel < 1.63 +Conflicts: libboost_random-devel-impl +Provides: libboost_random-devel-impl = %{version} -%description -n libboost_random%{lib_appendix}-devel +%description -n libboost_random%{library_version}-devel This package contains Boost.Random development headers. -%package -n libboost_chrono%{lib_appendix} +%package -n libboost_chrono%{library_version} Summary: The Boost::Chrono runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_chrono%{lib_appendix} +%description -n libboost_chrono%{library_version} This package contains the Boost::Chrono runtime library. -%package -n libboost_chrono%{lib_appendix}-devel +%package -n libboost_chrono%{library_version}-devel Summary: Development headers for Boost.Chrono library Group: Development/Libraries/C and C++ -Requires: libboost_chrono%{lib_appendix} = %{version} -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Provides: libboost_chrono-devel = %{version} -Conflicts: otherproviders(libboost_chrono-devel) +Requires: libboost_chrono%{library_version} = %{version} +Requires: libboost_headers%{library_version}-devel = %{version} Conflicts: boost-devel < 1.63 +Conflicts: libboost_chrono-devel-impl +Provides: libboost_chrono-devel-impl = %{version} -%description -n libboost_chrono%{lib_appendix}-devel +%description -n libboost_chrono%{library_version}-devel This package contains Boost.Chrono development headers. -%package -n libboost_locale%{lib_appendix} +%package -n libboost_locale%{library_version} Summary: Boost::Locale runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_locale%{lib_appendix} +%description -n libboost_locale%{library_version} This package contains Boost::Locale runtime library. -%package -n libboost_locale%{lib_appendix}-devel +%package -n libboost_locale%{library_version}-devel Summary: Development headers for Boost.Locale library Group: Development/Libraries/C and C++ -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Requires: libboost_locale%{lib_appendix} = %{version} -Provides: libboost_locale-devel = %{version} -Conflicts: otherproviders(libboost_locale-devel) +Requires: libboost_headers%{library_version}-devel = %{version} +Requires: libboost_locale%{library_version} = %{version} Conflicts: boost-devel < 1.63 +Conflicts: libboost_locale-devel-impl +Provides: libboost_locale-devel-impl = %{version} -%description -n libboost_locale%{lib_appendix}-devel +%description -n libboost_locale%{library_version}-devel This package contains development headers for Boost.Locale library. -%package -n libboost_timer%{lib_appendix} +%package -n libboost_timer%{library_version} Summary: Boost.Timer runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_timer%{lib_appendix} +%description -n libboost_timer%{library_version} This package contains Boost.Timer runtime library. -%package -n libboost_timer%{lib_appendix}-devel +%package -n libboost_timer%{library_version}-devel Summary: Development headers for Boost.Timer library Group: Development/Libraries/C and C++ -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Requires: libboost_system%{lib_appendix}-devel = %{version} -Requires: libboost_timer%{lib_appendix} = %{version} -Provides: libboost_timer-devel = %{version} -Conflicts: otherproviders(libboost_timer-devel) +Requires: libboost_headers%{library_version}-devel = %{version} +Requires: libboost_timer%{library_version} = %{version} Conflicts: boost-devel < 1.63 +Conflicts: libboost_timer-devel-impl +Provides: libboost_timer-devel-impl = %{version} -%description -n libboost_timer%{lib_appendix}-devel +%description -n libboost_timer%{library_version}-devel This package contains development headers for Boost.Timer library. -%package -n libboost_type_erasure%{lib_appendix} +%package -n libboost_type_erasure%{library_version} Summary: Boost.TypeErasure runtime library Group: System/Libraries -Requires: boost-license%{lib_appendix} +Requires: boost-license%{library_version} -%description -n libboost_type_erasure%{lib_appendix} +%description -n libboost_type_erasure%{library_version} This package contains Boost::TypeErasure runtime library. -%package -n libboost_type_erasure%{lib_appendix}-devel +%package -n libboost_type_erasure%{library_version}-devel Summary: Development headers for Boost.TypeErasure library Group: Development/Libraries/C and C++ -Requires: libboost_headers%{lib_appendix}-devel = %{version} -Requires: libboost_type_erasure%{lib_appendix} = %{version} -Provides: libboost_type_erasure-devel = %{version} -Conflicts: otherproviders(libboost_type_erasure-devel) +Requires: libboost_headers%{library_version}-devel = %{version} +Requires: libboost_type_erasure%{library_version} = %{version} Conflicts: boost-devel < 1.63 +Conflicts: libboost_type_erasure-devel-impl +Provides: libboost_type_erasure-devel-impl = %{version} -%description -n libboost_type_erasure%{lib_appendix}-devel +%description -n libboost_type_erasure%{library_version}-devel This package contains development headers for Boost.TypeErasure library. -%if %{with build_quickbook} %package -n %{package_name}-quickbook Summary: Documentation tool geared towards C++ Group: Development/Tools/Doc Generators -Requires: boost-license%{lib_appendix} -Provides: quickbook = %version -Conflicts: otherproviders(quickbook) +Requires: boost-license%{library_version} +Conflicts: quickbook +Provides: quickbook = %{version} %description -n %{package_name}-quickbook QuickBook is a WikiWiki style documentation tool geared towards C++ documentation using simple rules and markup for simple formatting tasks. + +%if %{with hpc} +%{hpc_master_package} +%{hpc_master_package devel} +%if %{with python2} +%{hpc_master_package python2} +%endif +%if %{with python3} +%{hpc_master_package python3} +%endif %endif %prep -%setup -q -n boost_%{lib_appendix} -b 3 +%setup -q -n boost_%{library_version} -b 3 #everything in the tarball has the executable flag set ... find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {} + %patch1 -p1 @@ -1141,7 +1221,7 @@ using gcc : : : \$(RPM_OPT_FLAGS) ; project user-config ; EOF -%if %build_base +%if %{build_base} cat << \EOF >.build export LIBRARIES_FLAGS="--without-mpi --without-python" %if ! %{with build_context} @@ -1178,7 +1258,11 @@ EOF %if %{with build_mpi} # Set PATH, MANPATH and LD_LIBRARY_PATH for mpi -. %{_libdir}/mpi/gcc/%{mpi_implem}/bin/mpivars.sh +%if %{with hpc} +module load gnu %mpi_flavor +%else +. %{package_libdir}/mpi/gcc/%{mpi_implem}/bin/mpivars.sh +%endif %endif # Need specific Boost Jam config files. @@ -1194,19 +1278,19 @@ EOF # bootstrap b2 ./bootstrap.sh \ - --prefix=%{_prefix} --exec-prefix=%{_bindir} \ - --libdir=%{_libdir} --includedir=%{_includedir} \ + --prefix=%{package_prefix} --exec-prefix=%{package_bindir} \ + --libdir=%{package_libdir} --includedir=%{package_includedir} \ --with-toolset=gcc # Read shared build instructions . ./.build -%if ! %build_base +%if ! %{build_base} # Build boost base PYTHON and MPI, installed in python staging cp user-config.jam user-config-py.jam cat << EOF >> user-config-py.jam -using python +using python : %{py_ver} : %{_bindir}/python2 : %{_includedir}/python%{py_ver} @@ -1233,7 +1317,7 @@ EOF cp user-config.jam user-config-py3.jam # sed -i -e 's#//boost_python#//boost_python3#' ./user-config-py3.jam %{?!py3_abiflags: %define py3_abiflags m} -%{?!python3_version: %define python3_version %py3_ver } +%{?!python3_version: %define python3_version %{py3_ver} } cat << EOF >> user-config-py3.jam using python @@ -1285,7 +1369,7 @@ echo 'using mpi ;' >> ./user-config.jam $LIBRARIES_FLAGS \ threading=multi link=shared runtime-link=shared stage -%if ! %build_base +%if ! %{build_base} # Verify that all symbols built in different stages are interchangeable. # Can't be too careful! @@ -1303,6 +1387,7 @@ chmod +x symbol_diff.sh #./symbol_diff.sh python-stage/lib/libboost_mpi.so stage/lib/libboost_mpi.so # Build documentation +%if ! %{with hpc} %if %{with build_quickbook} pushd tools/quickbook ../../b2 --user-config=../../user-config.jam --v2 dist-bin %{?_smp_mflags} @@ -1313,6 +1398,7 @@ popd cd doc ./b2 --user-config=../user-config.jam --v2 man %{?_smp_mflags} %endif +%endif # ! hpc %endif # ! build_base @@ -1321,19 +1407,23 @@ cd doc # Read shared build instructions . ./.build -%if ! %build_base +%if ! %{build_base} %if %{with build_mpi} # Set PATH, MANPATH and LD_LIBRARY_PATH for mpi -. %{_libdir}/mpi/gcc/%{mpi_implem}/bin/mpivars.sh +%if %{with hpc} +module load gnu %mpi_flavor +%else +. %{package_libdir}/mpi/gcc/%{mpi_implem}/bin/mpivars.sh +%endif %endif %if %{with python3} ./b2 -d+2 -q --user-config=./user-config-py3.jam \ --build-type=minimal --build-dir=./python3-build \ --python-buildid=py3 \ - --prefix=%{buildroot}%{_prefix} --exec-prefix=%{buildroot}%{_bindir} \ - --libdir=%{buildroot}%{_libdir} --includedir=%{buildroot}%{_includedir} \ + --prefix=%{buildroot}%{package_prefix} --exec-prefix=%{buildroot}%{package_bindir} \ + --libdir=%{buildroot}%{package_libdir} --includedir=%{buildroot}%{package_includedir} \ --stagedir=./python3-stage %{?_smp_mflags} \ $PY_LIBRARIES_FLAGS \ threading=multi link=shared runtime-link=shared install @@ -1343,8 +1433,8 @@ cd doc ./b2 -d+2 -q --user-config=./user-config-py.jam \ --build-type=minimal --build-dir=./python-build \ --python-buildid=py2.7 \ - --prefix=%{buildroot}%{_prefix} --exec-prefix=%{buildroot}%{_bindir} \ - --libdir=%{buildroot}%{_libdir} --includedir=%{buildroot}%{_includedir} \ + --prefix=%{buildroot}%{package_prefix} --exec-prefix=%{buildroot}%{package_bindir} \ + --libdir=%{buildroot}%{package_libdir} --includedir=%{buildroot}%{package_includedir} \ --stagedir=./python-stage %{?_smp_mflags} \ $PY_LIBRARIES_FLAGS \ threading=multi link=shared runtime-link=shared install @@ -1355,44 +1445,45 @@ cd doc # Generic install ./b2 -d+2 -q \ --build-type=minimal --build-dir=./build --stagedir=./stage \ - --prefix=%{buildroot}%{_prefix} --exec-prefix=%{buildroot}%{_bindir} \ - --libdir=%{buildroot}%{_libdir} --includedir=%{buildroot}%{_includedir} \ + --prefix=%{buildroot}%{package_prefix} --exec-prefix=%{buildroot}%{package_bindir} \ + --libdir=%{buildroot}%{package_libdir} --includedir=%{buildroot}%{package_includedir} \ --user-config=./user-config.jam \ $LIBRARIES_FLAGS \ threading=multi link=shared runtime-link=shared install # No python dependencies in the main tree -! $(ldd %{buildroot}%{_libdir}/*.so* | grep python\\.) +! $(ldd %{buildroot}%{package_libdir}/*.so* | grep python\\.) -%if ! %build_base +%if ! %{build_base} %if %{with python2} -ln -s libboost_mpi_python-py2_7.so %{buildroot}%{_libdir}/libboost_mpi_python.so -ln -s libboost_python-py2_7.so %{buildroot}%{_libdir}/libboost_python.so +ln -s libboost_mpi_python-py2_7.so %{buildroot}%{package_libdir}/libboost_mpi_python.so +ln -s libboost_python-py2_7.so %{buildroot}%{package_libdir}/libboost_python.so %endif %if %{with python3} -! $(ldd %{buildroot}%{_libdir}/*.so* | grep python3-\\.) -ln -s libboost_python-py3.so %{buildroot}%{_libdir}/libboost_python3.so +! $(ldd %{buildroot}%{package_libdir}/*.so* | grep python3-\\.) +ln -s libboost_python-py3.so %{buildroot}%{package_libdir}/libboost_python3.so %endif # Move Python libraries over to proper places %if %{with python2} -mkdir -p %{buildroot}%{python2_sitearch}/boost/parallel/mpi/ -mv %{buildroot}/%{_libdir}/mpi.so %{buildroot}%{python2_sitearch}/boost/parallel/mpi/ -install -m 0644 libs/mpi/build/__init__.py %{buildroot}%{python2_sitearch}/boost/parallel/mpi/ -install -m 0644 %{SOURCE11} %{buildroot}%{python2_sitearch}/boost/parallel -install -m 0644 %{SOURCE11} %{buildroot}%{python2_sitearch}/boost +mkdir -p %{buildroot}%{package_python2_sitearch}/boost/parallel/mpi/ +mv %{buildroot}/%{package_libdir}/mpi.so %{buildroot}%{package_python2_sitearch}/boost/parallel/mpi/ +install -m 0644 libs/mpi/build/__init__.py %{buildroot}%{package_python2_sitearch}/boost/parallel/mpi/ +install -m 0644 %{SOURCE11} %{buildroot}%{package_python2_sitearch}/boost/parallel +install -m 0644 %{SOURCE11} %{buildroot}%{package_python2_sitearch}/boost %endif %if %{with python3} -mkdir -p %{buildroot}%{python3_sitearch}/boost/parallel/mpi/ -mv %{buildroot}/%{_libdir}/mpi.*so %{buildroot}%{python3_sitearch}/boost/parallel/mpi/mpi.%{py3_soflags}.so -install -m 0644 libs/mpi/build/__init__.py %{buildroot}%{python3_sitearch}/boost/parallel/mpi/ -install -m 0644 %{SOURCE11} %{buildroot}%{python3_sitearch}/boost/parallel -install -m 0644 %{SOURCE11} %{buildroot}%{python3_sitearch}/boost +mkdir -p %{buildroot}%{package_python3_sitearch}/boost/parallel/mpi/ +mv %{buildroot}/%{package_libdir}/mpi.*so %{buildroot}%{package_python3_sitearch}/boost/parallel/mpi/mpi.%{py3_soflags}.so +install -m 0644 libs/mpi/build/__init__.py %{buildroot}%{package_python3_sitearch}/boost/parallel/mpi/ +install -m 0644 %{SOURCE11} %{buildroot}%{package_python3_sitearch}/boost/parallel +install -m 0644 %{SOURCE11} %{buildroot}%{package_python3_sitearch}/boost %endif +%if ! %{with hpc} #install doc files mkdir -p %{buildroot}%{my_docdir} %if %{with boost_devel} @@ -1402,527 +1493,522 @@ find libs/ -name \*.htm\* -o -name \*.css -o -name \*.js | xargs dos2unix find . -name \*.htm\* -o -name \*.gif -o -name \*.css -o -name \*.jpg -o -name \*.png -o -name \*.ico | \ tar --files-from=%{SOURCE4} -cf - --files-from=- | tar -C %{buildroot}%{my_docdir} -xf - rm -rf %{buildroot}%{my_docdir}/boost -#ln -s %%{_includedir}/boost %%{buildroot}%%{my_docdir} +#ln -s %%{package_includedir}/boost %%{buildroot}%%{my_docdir} #ln -s ../LICENSE_1_0.txt %%{buildroot}%%{my_docdir}/libs find %{buildroot}%{my_docdir} -name \*.py -exec chmod -x {} + -chmod -x ../boost_%{short_version}_pdf/*.pdf +chmod -x ../boost_1_56_pdf/*.pdf %if %{with build_quickbook} -mkdir -p %{buildroot}%{_bindir} -install -m 0755 dist/bin/quickbook %{buildroot}%{_bindir}/quickbook +mkdir -p %{buildroot}%{package_bindir} +install -m 0755 dist/bin/quickbook %{buildroot}%{package_bindir}/quickbook %endif - +%endif # ! hpc %endif # ! build_base -%if %build_base -mkdir -p %{buildroot}%{_bindir} -install -m 755 bjam %{buildroot}%{_bindir} -ln -s bjam %{buildroot}%{_bindir}/jam +%if %{build_base} +mkdir -p %{buildroot}%{package_bindir} +install -m 755 bjam %{buildroot}%{package_bindir} +ln -s bjam %{buildroot}%{package_bindir}/jam # 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, # verify that here. -objdump -Ctj .text -Ctj .text %{buildroot}%{_libdir}/libboost_exception.so | \ +objdump -Ctj .text -Ctj .text %{buildroot}%{package_libdir}/libboost_exception.so | \ grep '^[0-9a-f]\+[[:space:]]\+g[[:space:]]\+F' | \ sed -e 's#[0-9a-f]\+[[:space:]]\+g[[:space:]]\+F[[:space:]]\+\.text[[:space:]]\+[0-9a-f]\+[[:space:]]\+##' | \ diff %{SOURCE10} - || echo "WARNING: libexception symbol change?" -rm %{buildroot}%{_libdir}/libboost_exception.so -rm %{buildroot}%{_libdir}/libboost_exception.so.%{version} +rm %{buildroot}%{package_libdir}/libboost_exception.so +rm %{buildroot}%{package_libdir}/libboost_exception.so.%{version} -%fdupes %{buildroot}%{_includedir}/boost +%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 %else # ! build_base -rm -r %{buildroot}%{_includedir}/boost -rm %{buildroot}%{_libdir}/libboost_serialization* -rmdir --ignore-fail-on-non-empty %{buildroot}%{_libdir} +rm -r %{buildroot}%{package_includedir}/boost +rm %{buildroot}%{package_libdir}/libboost_serialization* +rmdir --ignore-fail-on-non-empty %{buildroot}%{package_libdir} %fdupes %{buildroot}%{my_docdir} %endif -%if %build_base -%post -n libboost_atomic%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_container%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_context%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_contract%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_coroutine%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_date_time%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_fiber%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_filesystem%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_iostreams%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_log%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_test%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_program_options%{lib_appendix} -p /sbin/ldconfig +%if %{with hpc} +%hpc_write_modules_files +#%%Module1.0##################################################################### -%post -n libboost_regex%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_serialization%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_signals%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_thread%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_type_erasure%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_math%{lib_appendix} -p /sbin/ldconfig +proc ModulesHelp { } { -%post -n libboost_graph%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_stacktrace%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_system%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_wave%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_random%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_chrono%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_locale%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_timer%{lib_appendix} -p /sbin/ldconfig +puts stderr " " +puts stderr "This module loads the %{pname} library built with the %{compiler_family} toolchain." +puts stderr "\nVersion %{version}\n" +} +module-whatis "Name: %{pname} built with %{compiler_family} toolchain" +module-whatis "Version: %{version}" +module-whatis "Category: runtime library" +module-whatis "Description: %{summary:0}" +module-whatis "URL: %{url}" + +set version %{version} + +prepend-path PATH %{hpc_bindir} +prepend-path MANPATH %{hpc_mandir} +prepend-path LD_LIBRARY_PATH %{hpc_libdir} +setenv BOOST_DIR %{hpc_path} +setenv BOOST_DIR %{hpc_libdir} +setenv BOOST_INC %{hpc_includedir} +if ([file isdirectory %{hpc_includedir}]) { +prepend-path CPATH %{hpc_includedir} +prepend-path C_INCLUDE_PATH %{hpc_includedir} +prepend-path CPLUS_INCLUDE_PATH %{hpc_includedir} +} +if ([file isdirectory %{package_python2_sitearch}]) { +prepend-path PYTHONPATH %{package_python2_sitearch} +} +if ([file isdirectory %{package_python3_sitearch}]) { +prepend-path PYTHONPATH %{package_python3_sitearch} +} + +%{hpc_modulefile_add_pkgconfig_path} + +EOF +%endif + +%if %{build_base} +%post -n libboost_atomic%{library_version} -p /sbin/ldconfig +%post -n libboost_container%{library_version} -p /sbin/ldconfig +%post -n libboost_context%{library_version} -p /sbin/ldconfig +%post -n libboost_contract%{library_version} -p /sbin/ldconfig +%post -n libboost_coroutine%{library_version} -p /sbin/ldconfig +%post -n libboost_date_time%{library_version} -p /sbin/ldconfig +%post -n libboost_fiber%{library_version} -p /sbin/ldconfig +%post -n libboost_filesystem%{library_version} -p /sbin/ldconfig +%post -n libboost_iostreams%{library_version} -p /sbin/ldconfig +%post -n libboost_log%{library_version} -p /sbin/ldconfig +%post -n libboost_test%{library_version} -p /sbin/ldconfig +%post -n libboost_program_options%{library_version} -p /sbin/ldconfig +%post -n libboost_regex%{library_version} -p /sbin/ldconfig +%post -n libboost_serialization%{library_version} -p /sbin/ldconfig +%post -n libboost_thread%{library_version} -p /sbin/ldconfig +%post -n libboost_type_erasure%{library_version} -p /sbin/ldconfig +%post -n libboost_math%{library_version} -p /sbin/ldconfig +%post -n libboost_graph%{library_version} -p /sbin/ldconfig +%post -n libboost_stacktrace%{library_version} -p /sbin/ldconfig +%post -n libboost_system%{library_version} -p /sbin/ldconfig +%post -n libboost_wave%{library_version} -p /sbin/ldconfig +%post -n libboost_random%{library_version} -p /sbin/ldconfig +%post -n libboost_chrono%{library_version} -p /sbin/ldconfig +%post -n libboost_locale%{library_version} -p /sbin/ldconfig +%post -n libboost_timer%{library_version} -p /sbin/ldconfig %else # ! build_base - %if %{with python2} -%post -n libboost_python-py2_7-%{lib_appendix} -p /sbin/ldconfig +%post -n libboost_python-py2_7-%{library_version} -p /sbin/ldconfig %if %{with python_numpy} -%post -n libboost_numpy-py2_7-%{lib_appendix} -p /sbin/ldconfig +%post -n libboost_numpy-py2_7-%{library_version} -p /sbin/ldconfig %endif %endif %if %{with python3} -%post -n libboost_python-py3-%{lib_appendix} -p /sbin/ldconfig +%post -n libboost_python-py3-%{library_version} -p /sbin/ldconfig %if %{with python_numpy} -%post -n libboost_numpy-py3-%{lib_appendix} -p /sbin/ldconfig +%post -n libboost_numpy-py3-%{library_version} -p /sbin/ldconfig %endif %endif %if %{with build_mpi} -%post -n libboost_mpi%{lib_appendix} -p /sbin/ldconfig -%post -n libboost_graph_parallel%{lib_appendix} -p /sbin/ldconfig +%post -n libboost_mpi%{library_version} -p /sbin/ldconfig +%post -n libboost_graph_parallel%{library_version} -p /sbin/ldconfig %if %{with python2} -%post -n libboost_mpi_python-py2_7-%{lib_appendix} -p /sbin/ldconfig +%post -n libboost_mpi_python-py2_7-%{library_version} -p /sbin/ldconfig %endif + %if %{with python3} -%post -n libboost_mpi_python-py3-%{lib_appendix} -p /sbin/ldconfig +%post -n libboost_mpi_python-py3-%{library_version} -p /sbin/ldconfig %endif %endif %endif # ! build_base +%if %{with hpc} +%post -n %base_name -p /sbin/ldconfig +%endif -%if %build_base -%postun -n libboost_atomic%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_container%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_context%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_contract%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_coroutine%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_date_time%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_fiber%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_filesystem%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_iostreams%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_log%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_test%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_program_options%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_regex%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_serialization%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_signals%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_thread%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_type_erasure%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_math%{lib_appendix} -p /sbin/ldconfig - -%postun -n libboost_graph%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_stacktrace%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_system%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_wave%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_random%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_chrono%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_locale%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_timer%{lib_appendix} -p /sbin/ldconfig - +%if %{build_base} +%postun -n libboost_atomic%{library_version} -p /sbin/ldconfig +%postun -n libboost_container%{library_version} -p /sbin/ldconfig +%postun -n libboost_context%{library_version} -p /sbin/ldconfig +%postun -n libboost_contract%{library_version} -p /sbin/ldconfig +%postun -n libboost_coroutine%{library_version} -p /sbin/ldconfig +%postun -n libboost_date_time%{library_version} -p /sbin/ldconfig +%postun -n libboost_fiber%{library_version} -p /sbin/ldconfig +%postun -n libboost_filesystem%{library_version} -p /sbin/ldconfig +%postun -n libboost_iostreams%{library_version} -p /sbin/ldconfig +%postun -n libboost_log%{library_version} -p /sbin/ldconfig +%postun -n libboost_test%{library_version} -p /sbin/ldconfig +%postun -n libboost_program_options%{library_version} -p /sbin/ldconfig +%postun -n libboost_regex%{library_version} -p /sbin/ldconfig +%postun -n libboost_serialization%{library_version} -p /sbin/ldconfig +%postun -n libboost_thread%{library_version} -p /sbin/ldconfig +%postun -n libboost_type_erasure%{library_version} -p /sbin/ldconfig +%postun -n libboost_math%{library_version} -p /sbin/ldconfig +%postun -n libboost_graph%{library_version} -p /sbin/ldconfig +%postun -n libboost_stacktrace%{library_version} -p /sbin/ldconfig +%postun -n libboost_system%{library_version} -p /sbin/ldconfig +%postun -n libboost_wave%{library_version} -p /sbin/ldconfig +%postun -n libboost_random%{library_version} -p /sbin/ldconfig +%postun -n libboost_chrono%{library_version} -p /sbin/ldconfig +%postun -n libboost_locale%{library_version} -p /sbin/ldconfig +%postun -n libboost_timer%{library_version} -p /sbin/ldconfig %else # ! build_base - %if %{with python2} -%postun -n libboost_python-py2_7-%{lib_appendix} -p /sbin/ldconfig +%postun -n libboost_python-py2_7-%{library_version} -p /sbin/ldconfig %if %{with python_numpy} -%postun -n libboost_numpy-py2_7-%{lib_appendix} -p /sbin/ldconfig +%postun -n libboost_numpy-py2_7-%{library_version} -p /sbin/ldconfig %endif %endif %if %{with python3} -%postun -n libboost_python-py3-%{lib_appendix} -p /sbin/ldconfig +%postun -n libboost_python-py3-%{library_version} -p /sbin/ldconfig %if %{with python_numpy} -%postun -n libboost_numpy-py3-%{lib_appendix} -p /sbin/ldconfig +%postun -n libboost_numpy-py3-%{library_version} -p /sbin/ldconfig %endif %endif %if %{with build_mpi} -%postun -n libboost_mpi%{lib_appendix} -p /sbin/ldconfig -%postun -n libboost_graph_parallel%{lib_appendix} -p /sbin/ldconfig +%postun -n libboost_mpi%{library_version} -p /sbin/ldconfig +%postun -n libboost_graph_parallel%{library_version} -p /sbin/ldconfig %if %{with python2} -%postun -n libboost_mpi_python-py2_7-%{lib_appendix} -p /sbin/ldconfig +%postun -n libboost_mpi_python-py2_7-%{library_version} -p /sbin/ldconfig %endif + %if %{with python3} -%postun -n libboost_mpi_python-py3-%{lib_appendix} -p /sbin/ldconfig +%postun -n libboost_mpi_python-py3-%{library_version} -p /sbin/ldconfig %endif %endif %endif # build_base -%if %{build_base} +%if %{with hpc} +%postun -n %{base_name} -p /sbin/ldconfig +%endif + +%if %{with hpc} + +%files +%hpc_modules_files +%{!?hpc_compiler_family:%dir %{hpc_install_base}} +%dir %{hpc_install_path_base} +%dir %{hpc_install_path} +%package_libdir +%exclude %package_libdir/*.so +%if %{with python2} +%exclude %package_python2_sitearch +%endif +%if %{with python3} +%exclude %package_python3_sitearch +%endif + +%files -n %{package_name}-devel +%package_includedir +%package_libdir/*.so +# do not package jam/bjam when building with mpi +%if ! %{with mpi} %files -n %{package_name}-jam -%defattr(-, root, root, -) -%{_bindir}/bjam -%{_bindir}/jam +%package_bindir +%endif # ! +%if %{with python2} +%files -n %{package_name}-python2 +%package_python2_sitearch +%endif +%if %{with python3} +%files -n %{package_name}-python3 +%package_python3_sitearch +%endif -%files -n libboost_atomic%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_atomic.so.%{version} +%else +%if %{build_base} +%files -n boost%{library_version}-jam +%{package_bindir}/bjam +%{package_bindir}/jam -%files -n libboost_atomic%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_atomic.so +%files -n libboost_atomic%{library_version} +%{package_libdir}/libboost_atomic.so.%{version} -%files -n libboost_container%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_container.so.%{version} +%files -n libboost_atomic%{library_version}-devel +%{package_libdir}/libboost_atomic.so -%files -n libboost_container%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_container.so +%files -n libboost_container%{library_version} +%{package_libdir}/libboost_container.so.%{version} + +%files -n libboost_container%{library_version}-devel +%{package_libdir}/libboost_container.so %if %{with build_context} +%files -n libboost_context%{library_version} +%{package_libdir}/libboost_context.so.%{version} -%files -n libboost_context%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_context.so.%{version} +%files -n libboost_context%{library_version}-devel +%{package_libdir}/libboost_context.so -%files -n libboost_context%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_context.so +%files -n libboost_coroutine%{library_version} +%{package_libdir}/libboost_coroutine.so.%{version} -%files -n libboost_coroutine%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_coroutine.so.%{version} - -%files -n libboost_coroutine%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_coroutine.so +%files -n libboost_coroutine%{library_version}-devel +%{package_libdir}/libboost_coroutine.so %endif # if with build_context -%files -n libboost_contract%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_contract.so.%{version} +%files -n libboost_contract%{library_version} +%{package_libdir}/libboost_contract.so.%{version} -%files -n libboost_contract%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_contract.so +%files -n libboost_contract%{library_version}-devel +%{package_libdir}/libboost_contract.so -%files -n libboost_date_time%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_date_time.so.%{version} +%files -n libboost_date_time%{library_version} +%{package_libdir}/libboost_date_time.so.%{version} -%files -n libboost_date_time%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_date_time.so +%files -n libboost_date_time%{library_version}-devel +%{package_libdir}/libboost_date_time.so %if %{with boost_fiber} +%files -n libboost_fiber%{library_version} +%{package_libdir}/libboost_fiber.so.%{version} -%files -n libboost_fiber%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_fiber.so.%{version} - -%files -n libboost_fiber%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_fiber.so +%files -n libboost_fiber%{library_version}-devel +%{package_libdir}/libboost_fiber.so %endif # with boost_fiber -%files -n libboost_filesystem%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_filesystem.so.%{version} +%files -n libboost_filesystem%{library_version} +%{package_libdir}/libboost_filesystem.so.%{version} -%files -n libboost_filesystem%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_filesystem.so +%files -n libboost_filesystem%{library_version}-devel +%{package_libdir}/libboost_filesystem.so -%files -n libboost_graph%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_graph.so.%{version} +%files -n libboost_graph%{library_version} +%{package_libdir}/libboost_graph.so.%{version} -%files -n libboost_graph%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_graph.so +%files -n libboost_graph%{library_version}-devel +%{package_libdir}/libboost_graph.so -%files -n libboost_iostreams%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_iostreams.so.%{version} +%files -n libboost_iostreams%{library_version} +%{package_libdir}/libboost_iostreams.so.%{version} -%files -n libboost_iostreams%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_iostreams.so +%files -n libboost_iostreams%{library_version}-devel +%{package_libdir}/libboost_iostreams.so -%files -n libboost_log%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_log.so.%{version} -%{_libdir}/libboost_log_setup.so.%{version} +%files -n libboost_log%{library_version} +%{package_libdir}/libboost_log.so.%{version} +%{package_libdir}/libboost_log_setup.so.%{version} -%files -n libboost_log%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_log.so -%{_libdir}/libboost_log_setup.so +%files -n libboost_log%{library_version}-devel +%{package_libdir}/libboost_log.so +%{package_libdir}/libboost_log_setup.so -%files -n libboost_math%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_math_c99f.so.%{version} -%{_libdir}/libboost_math_c99l.so.%{version} -%{_libdir}/libboost_math_c99.so.%{version} -%{_libdir}/libboost_math_tr1f.so.%{version} -%{_libdir}/libboost_math_tr1l.so.%{version} -%{_libdir}/libboost_math_tr1.so.%{version} +%files -n libboost_math%{library_version} +%{package_libdir}/libboost_math_c99f.so.%{version} +%{package_libdir}/libboost_math_c99l.so.%{version} +%{package_libdir}/libboost_math_c99.so.%{version} +%{package_libdir}/libboost_math_tr1f.so.%{version} +%{package_libdir}/libboost_math_tr1l.so.%{version} +%{package_libdir}/libboost_math_tr1.so.%{version} -%files -n libboost_math%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_math_c99f.so -%{_libdir}/libboost_math_c99l.so -%{_libdir}/libboost_math_c99.so -%{_libdir}/libboost_math_tr1f.so -%{_libdir}/libboost_math_tr1l.so -%{_libdir}/libboost_math_tr1.so +%files -n libboost_math%{library_version}-devel +%{package_libdir}/libboost_math_c99f.so +%{package_libdir}/libboost_math_c99l.so +%{package_libdir}/libboost_math_c99.so +%{package_libdir}/libboost_math_tr1f.so +%{package_libdir}/libboost_math_tr1l.so +%{package_libdir}/libboost_math_tr1.so -%files -n libboost_test%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_prg_exec_monitor.so.%{version} -%{_libdir}/libboost_test_exec_monitor.so.%{version} -%{_libdir}/libboost_unit_test_framework.so.%{version} +%files -n libboost_test%{library_version} +%{package_libdir}/libboost_prg_exec_monitor.so.%{version} +%{package_libdir}/libboost_test_exec_monitor.so.%{version} +%{package_libdir}/libboost_unit_test_framework.so.%{version} -%files -n libboost_test%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_prg_exec_monitor.so -%{_libdir}/libboost_test_exec_monitor.so -%{_libdir}/libboost_unit_test_framework.so +%files -n libboost_test%{library_version}-devel +%{package_libdir}/libboost_prg_exec_monitor.so +%{package_libdir}/libboost_test_exec_monitor.so +%{package_libdir}/libboost_unit_test_framework.so -%files -n libboost_program_options%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_program_options.so.%{version} +%files -n libboost_program_options%{library_version} +%{package_libdir}/libboost_program_options.so.%{version} -%files -n libboost_program_options%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_program_options.so +%files -n libboost_program_options%{library_version}-devel +%{package_libdir}/libboost_program_options.so %endif # build_base -%if ! %build_base +%if ! %{build_base} %if %{with build_mpi} -%files -n libboost_mpi%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_mpi.so.%{version} +%files -n libboost_mpi%{library_version} +%{package_libdir}/libboost_mpi.so.%{version} -%files -n libboost_mpi%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_mpi.so +%files -n libboost_mpi%{library_version}-devel +%{package_libdir}/libboost_mpi.so -%files -n libboost_graph_parallel%{lib_appendix} -%defattr(-,root,root) -%{_libdir}/libboost_graph_parallel.so.%{version} +%files -n libboost_graph_parallel%{library_version} +%{package_libdir}/libboost_graph_parallel.so.%{version} -%files -n libboost_graph_parallel%{lib_appendix}-devel -%defattr(-,root,root) -%{_libdir}/libboost_graph_parallel.so +%files -n libboost_graph_parallel%{library_version}-devel +%{package_libdir}/libboost_graph_parallel.so %if %{with python2} -%files -n libboost_mpi_python-py2_7-%{lib_appendix} -%defattr(-,root,root) -%{_libdir}/libboost_mpi_python-py2_7.so.%{version} +%files -n libboost_mpi_python-py2_7-%{library_version} +%{package_libdir}/libboost_mpi_python-py2_7.so.%{version} -%files -n libboost_mpi_python-py2_7-%{lib_appendix}-devel -%defattr(-,root,root) -%{_libdir}/libboost_mpi_python-py2_7.so -%{_libdir}/libboost_mpi_python.so +%files -n libboost_mpi_python-py2_7-%{library_version}-devel +%{package_libdir}/libboost_mpi_python-py2_7.so +%{package_libdir}/libboost_mpi_python.so -%files -n python2-boost_parallel_mpi%{lib_appendix} -%defattr(-, root, root, -) -%dir %{python2_sitearch}/boost -%dir %{python2_sitearch}/boost/parallel -%dir %{python2_sitearch}/boost/parallel/mpi -%{python2_sitearch}/boost/__init__.py -%{python2_sitearch}/boost/parallel/__init__.py -%{python2_sitearch}/boost/parallel/mpi/__init__.py -%{python2_sitearch}/boost/parallel/mpi/mpi.so +%files -n python2-boost_parallel_mpi%{library_version} +%dir %{package_python2_sitearch}/boost +%dir %{package_python2_sitearch}/boost/parallel +%dir %{package_python2_sitearch}/boost/parallel/mpi +%{package_python2_sitearch}/boost/__init__.py +%{package_python2_sitearch}/boost/parallel/__init__.py +%{package_python2_sitearch}/boost/parallel/mpi/__init__.py +%{package_python2_sitearch}/boost/parallel/mpi/mpi.so %endif # with python2 %if %{with python3} -%files -n libboost_mpi_python-py3-%{lib_appendix} -%defattr(-,root,root) -%{_libdir}/libboost_mpi_python-py3.so.%{version} +%files -n libboost_mpi_python-py3-%{library_version} +%{package_libdir}/libboost_mpi_python-py3.so.%{version} -%files -n libboost_mpi_python-py3-%{lib_appendix}-devel -%defattr(-,root,root) -%{_libdir}/libboost_mpi_python-py3.so +%files -n libboost_mpi_python-py3-%{library_version}-devel +%{package_libdir}/libboost_mpi_python-py3.so -%files -n python3-boost_parallel_mpi%{lib_appendix} -%defattr(-, root, root, -) -%dir %{python3_sitearch}/boost -%dir %{python3_sitearch}/boost/parallel -%dir %{python3_sitearch}/boost/parallel/mpi -%{python3_sitearch}/boost/__init__.py -%{python3_sitearch}/boost/parallel/__init__.py -%{python3_sitearch}/boost/parallel/mpi/__init__.py -%{python3_sitearch}/boost/parallel/mpi/mpi.%{py3_soflags}.so +%files -n python3-boost_parallel_mpi%{library_version} +%dir %{package_python3_sitearch}/boost +%dir %{package_python3_sitearch}/boost/parallel +%dir %{package_python3_sitearch}/boost/parallel/mpi +%{package_python3_sitearch}/boost/__init__.py +%{package_python3_sitearch}/boost/parallel/__init__.py +%{package_python3_sitearch}/boost/parallel/mpi/__init__.py +%{package_python3_sitearch}/boost/parallel/mpi/mpi.%{py3_soflags}.so %endif # with python3 %endif # with build_mpi %if %{with python2} -%files -n libboost_python-py2_7-%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_python-py2_7.so.%{version} +%files -n libboost_python-py2_7-%{library_version} +%{package_libdir}/libboost_python-py2_7.so.%{version} -%files -n libboost_python-py2_7-%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_python.so -%{_libdir}/libboost_python-py2_7.so +%files -n libboost_python-py2_7-%{library_version}-devel +%{package_libdir}/libboost_python.so +%{package_libdir}/libboost_python-py2_7.so %if %{with python_numpy} -%files -n libboost_numpy-py2_7-%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_numpy-py2_7.so.%{version} +%files -n libboost_numpy-py2_7-%{library_version} +%{package_libdir}/libboost_numpy-py2_7.so.%{version} -%files -n libboost_numpy-py2_7-%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_numpy-py2_7.so +%files -n libboost_numpy-py2_7-%{library_version}-devel +%{package_libdir}/libboost_numpy-py2_7.so %endif # with numpy %endif # with python2 %if %{with python3} -%files -n libboost_python-py3-%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_python-py3.so.%{version} +%files -n libboost_python-py3-%{library_version} +%{package_libdir}/libboost_python-py3.so.%{version} -%files -n libboost_python-py3-%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_python3.so -%{_libdir}/libboost_python-py3.so +%files -n libboost_python-py3-%{library_version}-devel +%{package_libdir}/libboost_python3.so +%{package_libdir}/libboost_python-py3.so %if %{with python_numpy} -%files -n libboost_numpy-py3-%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_numpy-py3.so.%{version} +%files -n libboost_numpy-py3-%{library_version} +%{package_libdir}/libboost_numpy-py3.so.%{version} -%files -n libboost_numpy-py3-%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_numpy-py3.so +%files -n libboost_numpy-py3-%{library_version}-devel +%{package_libdir}/libboost_numpy-py3.so %endif # with numpy %endif # with python3 %endif # ! build_base -%if %build_base -%files -n libboost_serialization%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_serialization.so.%{version} -%{_libdir}/libboost_wserialization.so.%{version} +%if %{build_base} +%files -n libboost_serialization%{library_version} +%{package_libdir}/libboost_serialization.so.%{version} +%{package_libdir}/libboost_wserialization.so.%{version} -%files -n libboost_serialization%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_serialization.so -%{_libdir}/libboost_wserialization.so +%files -n libboost_serialization%{library_version}-devel +%{package_libdir}/libboost_serialization.so +%{package_libdir}/libboost_wserialization.so -%files -n libboost_signals%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_signals.so.%{version} +%files -n libboost_stacktrace%{library_version} +%{package_libdir}/libboost_stacktrace_addr2line.so.%{version} +%{package_libdir}/libboost_stacktrace_basic.so.%{version} +%{package_libdir}/libboost_stacktrace_noop.so.%{version} -%files -n libboost_signals%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_signals.so +%files -n libboost_stacktrace%{library_version}-devel +%{package_libdir}/libboost_stacktrace_addr2line.so +%{package_libdir}/libboost_stacktrace_basic.so +%{package_libdir}/libboost_stacktrace_noop.so -%files -n libboost_stacktrace%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_stacktrace_addr2line.so.%{version} -%{_libdir}/libboost_stacktrace_basic.so.%{version} -%{_libdir}/libboost_stacktrace_noop.so.%{version} +%files -n libboost_system%{library_version} +%{package_libdir}/libboost_system.so.%{version} -%files -n libboost_stacktrace%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_stacktrace_addr2line.so -%{_libdir}/libboost_stacktrace_basic.so -%{_libdir}/libboost_stacktrace_noop.so +%files -n libboost_system%{library_version}-devel +%{package_libdir}/libboost_system.so -%files -n libboost_system%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_system.so.%{version} +%files -n libboost_thread%{library_version} +%{package_libdir}/libboost_thread.so.%{version} -%files -n libboost_system%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_system.so +%files -n libboost_thread%{library_version}-devel +%{package_libdir}/libboost_thread.so -%files -n libboost_thread%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_thread.so.%{version} +%files -n libboost_wave%{library_version} +%{package_libdir}/libboost_wave.so.%{version} -%files -n libboost_thread%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_thread.so +%files -n libboost_wave%{library_version}-devel +%{package_libdir}/libboost_wave.so -%files -n libboost_wave%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_wave.so.%{version} +%files -n libboost_regex%{library_version} +%{package_libdir}/libboost_regex.so.%{version} -%files -n libboost_wave%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_wave.so +%files -n libboost_regex%{library_version}-devel +%{package_libdir}/libboost_regex.so -%files -n libboost_regex%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_regex.so.%{version} +%files -n libboost_random%{library_version} +%{package_libdir}/libboost_random.so.%{version} -%files -n libboost_regex%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_regex.so +%files -n libboost_random%{library_version}-devel +%{package_libdir}/libboost_random.so -%files -n libboost_random%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_random.so.%{version} +%files -n libboost_chrono%{library_version} +%{package_libdir}/libboost_chrono.so.%{version} -%files -n libboost_random%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_random.so +%files -n libboost_chrono%{library_version}-devel +%{package_libdir}/libboost_chrono.so -%files -n libboost_chrono%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_chrono.so.%{version} +%files -n libboost_locale%{library_version} +%{package_libdir}/libboost_locale.so.%{version} -%files -n libboost_chrono%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_chrono.so +%files -n libboost_locale%{library_version}-devel +%{package_libdir}/libboost_locale.so -%files -n libboost_locale%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_locale.so.%{version} +%files -n libboost_timer%{library_version} +%{package_libdir}/libboost_timer.so.%{version} -%files -n libboost_locale%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_locale.so +%files -n libboost_timer%{library_version}-devel +%{package_libdir}/libboost_timer.so -%files -n libboost_timer%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_timer.so.%{version} +%files -n libboost_type_erasure%{library_version} +%{package_libdir}/libboost_type_erasure.so.%{version} -%files -n libboost_timer%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_timer.so - -%files -n libboost_type_erasure%{lib_appendix} -%defattr(-, root, root, -) -%{_libdir}/libboost_type_erasure.so.%{version} - -%files -n libboost_type_erasure%{lib_appendix}-devel -%defattr(-, root, root, -) -%{_libdir}/libboost_type_erasure.so +%files -n libboost_type_erasure%{library_version}-devel +%{package_libdir}/libboost_type_erasure.so %endif # if build_base -%if ! %build_base +%if ! %{build_base} %if %{with boost_devel} %files -n %{package_name}-devel -%defattr(-, root, root, -) %dir %{my_docdir} %{my_docdir}/README.boost-devel %endif %files -n %{package_name}-doc-html -%defattr(-, root, root, -) %dir %{my_docdir} %doc %{my_docdir}/* %if %{with boost_devel} @@ -1931,38 +2017,34 @@ rmdir --ignore-fail-on-non-empty %{buildroot}%{_libdir} %if %{with build_docs} %files doc-man -%defattr(-, root, root, -) -%doc %{_mandir}/man3/*.3.gz -%doc %{_mandir}/man7/*.7.gz -%doc %{_mandir}/man9/*.9.gz +%{_mandir}/man3/*.3%{?ext_man} +%{_mandir}/man7/*.7%{?ext_man} +%{_mandir}/man9/*.9%{?ext_man} %endif %if %{with package_pdf} %files -n %{package_name}-doc-pdf -%defattr(-, root, root, -) -%doc ../boost_%{short_version}_pdf/*.pdf +%doc ../boost_1_56_pdf/*.pdf %endif %if %{with build_quickbook} %files -n %{package_name}-quickbook -%defattr(-, root, root, -) -%{_bindir}/quickbook +%{package_bindir}/quickbook %endif %endif # ! build_base -%if %build_base -%files -n libboost_headers%{lib_appendix}-devel -%defattr(-, root, root, -) -%dir %{_includedir}/boost -%{_includedir}/boost/* +%if %{build_base} +%files -n libboost_headers%{library_version}-devel +%dir %{package_includedir}/boost +%{package_includedir}/boost/* -%files -n boost-license%{lib_appendix} -%defattr(-, root, root, -) +%files -n boost-license%{library_version} %license LICENSE_1_0.txt %if 0%{?sle_version} >= 120000 && 0%{?sle_version} <= 120200 && !0%{?is_opensuse} %attr(755,root,root) %dir %{_defaultlicensedir} %endif %endif +%endif # without hpc %changelog diff --git a/boost_1_68_0.tar.bz2 b/boost_1_68_0.tar.bz2 deleted file mode 100644 index 3f6c976..0000000 --- a/boost_1_68_0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7 -size 92155315 diff --git a/boost_1_69_0.tar.bz2 b/boost_1_69_0.tar.bz2 new file mode 100644 index 0000000..41fa779 --- /dev/null +++ b/boost_1_69_0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406 +size 95078138 diff --git a/dynamic_linking.patch b/dynamic_linking.patch index 1436728..3c09e75 100644 --- a/dynamic_linking.patch +++ b/dynamic_linking.patch @@ -1,8 +1,8 @@ -Index: boost_1_63_0/libs/test/build/Jamfile.v2 +Index: boost_1_69_0/libs/test/build/Jamfile.v2 =================================================================== ---- boost_1_63_0.orig/libs/test/build/Jamfile.v2 -+++ boost_1_63_0/libs/test/build/Jamfile.v2 -@@ -93,7 +93,7 @@ lib boost_test_exec_monitor +--- boost_1_69_0.orig/libs/test/build/Jamfile.v2 ++++ boost_1_69_0/libs/test/build/Jamfile.v2 +@@ -102,7 +102,7 @@ lib boost_test_exec_monitor : # sources $(TEST_EXEC_MON_SOURCES).cpp : # requirements @@ -11,10 +11,10 @@ Index: boost_1_63_0/libs/test/build/Jamfile.v2 : # default build : # usage-requirements shared:BOOST_TEST_DYN_LINK=1 -Index: boost_1_63_0/libs/exception/build/Jamfile.v2 +Index: boost_1_69_0/libs/exception/build/Jamfile.v2 =================================================================== ---- boost_1_63_0.orig/libs/exception/build/Jamfile.v2 -+++ boost_1_63_0/libs/exception/build/Jamfile.v2 +--- boost_1_69_0.orig/libs/exception/build/Jamfile.v2 ++++ boost_1_69_0/libs/exception/build/Jamfile.v2 @@ -7,7 +7,7 @@ project boost/exception @@ -24,20 +24,20 @@ Index: boost_1_63_0/libs/exception/build/Jamfile.v2 ; lib boost_exception : clone_current_exception_non_intrusive.cpp ; -Index: boost_1_63_0/libs/chrono/build/Jamfile.v2 +Index: boost_1_69_0/libs/chrono/build/Jamfile.v2 =================================================================== ---- boost_1_63_0.orig/libs/chrono/build/Jamfile.v2 -+++ boost_1_63_0/libs/chrono/build/Jamfile.v2 -@@ -99,7 +99,7 @@ project boost/chrono +--- boost_1_69_0.orig/libs/chrono/build/Jamfile.v2 ++++ boost_1_69_0/libs/chrono/build/Jamfile.v2 +@@ -97,7 +97,7 @@ project boost/chrono + sun:__typeof__=__typeof__ - BOOST_SYSTEM_NO_DEPRECATED shared:BOOST_CHRONO_DYN_LINK=1 - static:BOOST_CHRONO_STATIC_LINK=1 + # static:BOOST_CHRONO_STATIC_LINK=1 gcc-3.4.4:--enable-auto-import gcc-4.3.4:--enable-auto-import gcc-4.4.0,windows:--enable-auto-import -@@ -113,6 +113,6 @@ lib boost_chrono +@@ -111,6 +111,6 @@ lib boost_chrono : $(SOURCES).cpp : shared:BOOST_ALL_DYN_LINK=1 # tell source we're building dll's @@ -45,10 +45,10 @@ Index: boost_1_63_0/libs/chrono/build/Jamfile.v2 + # static:BOOST_All_STATIC_LINK=1 # tell source we're building static lib's ; -Index: boost_1_63_0/libs/system/build/Jamfile.v2 +Index: boost_1_69_0/libs/system/build/Jamfile.v2 =================================================================== ---- boost_1_63_0.orig/libs/system/build/Jamfile.v2 -+++ boost_1_63_0/libs/system/build/Jamfile.v2 +--- boost_1_69_0.orig/libs/system/build/Jamfile.v2 ++++ boost_1_69_0/libs/system/build/Jamfile.v2 @@ -11,7 +11,7 @@ project boost/system : source-location ../src : usage-requirements # pass these requirement to dependents (i.e. users) @@ -66,13 +66,11 @@ Index: boost_1_63_0/libs/system/build/Jamfile.v2 +# static:BOOST_SYSTEM_STATIC_LINK=1 ; --boost-install boost_system ; -\ No newline at end of file -+boost-install boost_system ; -Index: boost_1_63_0/libs/timer/build/Jamfile.v2 + boost-install boost_system ; +Index: boost_1_69_0/libs/timer/build/Jamfile.v2 =================================================================== ---- boost_1_63_0.orig/libs/timer/build/Jamfile.v2 -+++ boost_1_63_0/libs/timer/build/Jamfile.v2 +--- boost_1_69_0.orig/libs/timer/build/Jamfile.v2 ++++ boost_1_69_0/libs/timer/build/Jamfile.v2 @@ -14,7 +14,7 @@ project boost/timer /boost/system//boost_system : usage-requirements # pass these requirement to dependants (i.e. users) @@ -91,10 +89,10 @@ Index: boost_1_63_0/libs/timer/build/Jamfile.v2 ; boost-install boost_timer ; -Index: boost_1_63_0/libs/filesystem/build/Jamfile.v2 +Index: boost_1_69_0/libs/filesystem/build/Jamfile.v2 =================================================================== ---- boost_1_63_0.orig/libs/filesystem/build/Jamfile.v2 -+++ boost_1_63_0/libs/filesystem/build/Jamfile.v2 +--- boost_1_69_0.orig/libs/filesystem/build/Jamfile.v2 ++++ boost_1_69_0/libs/filesystem/build/Jamfile.v2 @@ -11,7 +11,7 @@ project boost/filesystem : source-location ../src : usage-requirements # pass these requirement to dependents (i.e. users) diff --git a/python_library_name.patch b/python_library_name.patch index 99556fb..9333e4d 100644 --- a/python_library_name.patch +++ b/python_library_name.patch @@ -27,10 +27,10 @@ MPI module needs to reference correct python ~ boost_mpi_python ~ boost_mpi ~ /mpi//mpi [ mpi.extra-requirements ] -Index: boost_1_68_0/libs/python/Jamfile +Index: boost_1_69_0/libs/python/Jamfile =================================================================== ---- boost_1_68_0.orig/libs/python/Jamfile -+++ boost_1_68_0/libs/python/Jamfile +--- boost_1_69_0.orig/libs/python/Jamfile ++++ boost_1_69_0/libs/python/Jamfile @@ -36,9 +36,10 @@ local rule split-version ( version ) # For example, Boost.Python built for Python 2.7 uses the suffix "27" rule version-suffix ( version ) @@ -45,3 +45,21 @@ Index: boost_1_68_0/libs/python/Jamfile } +Index: boost_1_69_0/libs/mpi/build/Jamfile.v2 +=================================================================== +--- boost_1_69_0.orig/libs/mpi/build/Jamfile.v2 ++++ boost_1_69_0/libs/mpi/build/Jamfile.v2 +@@ -42,9 +42,10 @@ local rule split-version ( version ) + # For example, Boost.Python built for Python 2.7 uses the suffix "27" + rule version-suffix ( version ) + { +- local major-minor = [ split-version $(version) ] ; +- local suffix = $(major-minor:J="") ; +- return $(suffix) ; ++ #local major-minor = [ split-version $(version) ] ; ++ #local suffix = $(major-minor:J="") ; ++ #return $(suffix) ; ++ return "" ; + } + +