Compare commits
11 Commits
| Author | SHA1 | Date |
|---|---|---|
Jonathan Wakely
|
b4161c034b | |
|
Jonathan Wakely
|
783423d8bf | |
|
Jonathan Wakely
|
a1d6628b87 | |
|
Jonathan Wakely
|
a1de2dd789 | |
|
Jonathan Wakely
|
0ce09a361d | |
|
Jonathan Wakely
|
85cce1266f | |
Zbigniew Jędrzejewski-Szmek
|
e6f200d1fc | |
Sandro Mani
|
856666bfc5 | |
|
Jonathan Wakely
|
ece46177bc | |
|
Jonathan Wakely
|
ab7969c7cd | |
|
Jonathan Wakely
|
488acc0800 |
|
|
@ -0,0 +1,26 @@
|
|||
From 8787f6b0718b6b0750869ba52bc65d26db665a05 Mon Sep 17 00:00:00 2001
|
||||
From: Ananth Jasty <ajasty@cavium.com>
|
||||
Date: Wed, 15 Apr 2015 17:59:47 -0700
|
||||
Subject: [PATCH] Changes required for aarch64 support in boost::config.
|
||||
|
||||
---
|
||||
libs/config/checks/architecture/arm.cpp | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libs/config/checks/architecture/arm.cpp b/libs/config/checks/architecture/arm.cpp
|
||||
index 6a83737..794aba8 100644
|
||||
--- a/libs/config/checks/architecture/arm.cpp
|
||||
+++ b/libs/config/checks/architecture/arm.cpp
|
||||
@@ -8,6 +8,8 @@
|
||||
|
||||
#if !defined(__arm__) && !defined(__thumb__) && \
|
||||
!defined(__TARGET_ARCH_ARM) && !defined(__TARGET_ARCH_THUMB) && \
|
||||
- !defined(_ARM) && !defined(_M_ARM)
|
||||
+ !defined(_ARM) && !defined(_M_ARM) && \
|
||||
+ !defined(__aarch64__)
|
||||
#error "Not ARM"
|
||||
#endif
|
||||
+
|
||||
--
|
||||
2.4.5
|
||||
|
||||
|
|
@ -0,0 +1,98 @@
|
|||
diff --git a/include/boost/fusion/adapted/struct/detail/define_struct.hpp b/include/boost/fusion/adapted/struct/detail/define_struct.hpp
|
||||
index 2554292..ce3737e 100644
|
||||
--- a/include/boost/fusion/adapted/struct/detail/define_struct.hpp
|
||||
+++ b/include/boost/fusion/adapted/struct/detail/define_struct.hpp
|
||||
@@ -69,7 +69,7 @@
|
||||
ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE) \
|
||||
\
|
||||
template<typename Seq> \
|
||||
- BOOST_CXX14_CONSTEXPR BOOST_FUSION_GPU_ENABLED \
|
||||
+ BOOST_FUSION_GPU_ENABLED \
|
||||
self_type& \
|
||||
operator=(Seq const& seq) \
|
||||
{ \
|
||||
@@ -128,7 +128,7 @@
|
||||
ATTRIBUTE_TUPEL_SIZE, \
|
||||
ATTRIBUTES_SEQ) \
|
||||
\
|
||||
- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \
|
||||
+ BOOST_FUSION_GPU_ENABLED \
|
||||
NAME() \
|
||||
: BOOST_PP_SEQ_FOR_EACH_I_R( \
|
||||
1, \
|
||||
@@ -137,7 +137,7 @@
|
||||
ATTRIBUTES_SEQ) \
|
||||
{} \
|
||||
\
|
||||
- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \
|
||||
+ BOOST_FUSION_GPU_ENABLED \
|
||||
NAME(self_type const& other_self) \
|
||||
: BOOST_PP_SEQ_FOR_EACH_I_R( \
|
||||
1, \
|
||||
@@ -147,7 +147,7 @@
|
||||
{} \
|
||||
\
|
||||
template<typename Seq> \
|
||||
- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \
|
||||
+ BOOST_FUSION_GPU_ENABLED \
|
||||
NAME(Seq const& seq \
|
||||
BOOST_PP_IF( \
|
||||
BOOST_PP_DEC(BOOST_PP_SEQ_SIZE(ATTRIBUTES_SEQ)), \
|
||||
@@ -167,7 +167,7 @@
|
||||
#define BOOST_FUSION_DEFINE_STRUCT_CTOR_1( \
|
||||
NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE) \
|
||||
\
|
||||
- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \
|
||||
+ BOOST_FUSION_GPU_ENABLED \
|
||||
explicit \
|
||||
NAME(boost::call_traits< \
|
||||
BOOST_PP_TUPLE_ELEM( \
|
||||
@@ -180,7 +180,7 @@
|
||||
#define BOOST_FUSION_DEFINE_TPL_STRUCT_CTOR_1( \
|
||||
TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE) \
|
||||
\
|
||||
- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \
|
||||
+ BOOST_FUSION_GPU_ENABLED \
|
||||
explicit \
|
||||
NAME(typename boost::call_traits< \
|
||||
typename boost::fusion::detail::get_first_arg< \
|
||||
@@ -217,7 +217,7 @@
|
||||
#define BOOST_FUSION_DEFINE_TPL_STRUCT_CTOR_N( \
|
||||
TEMPLATE_PARAMS_SEQ, NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE) \
|
||||
\
|
||||
- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \
|
||||
+ BOOST_FUSION_GPU_ENABLED \
|
||||
NAME(BOOST_PP_SEQ_FOR_EACH_I_R( \
|
||||
1, \
|
||||
BOOST_FUSION_DEFINE_TPL_STRUCT_CTOR_ARG_I, \
|
||||
@@ -245,7 +245,7 @@
|
||||
#define BOOST_FUSION_DEFINE_STRUCT_CTOR_N( \
|
||||
NAME, ATTRIBUTES_SEQ, ATTRIBUTE_TUPEL_SIZE) \
|
||||
\
|
||||
- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \
|
||||
+ BOOST_FUSION_GPU_ENABLED \
|
||||
NAME(BOOST_PP_SEQ_FOR_EACH_I_R( \
|
||||
1, \
|
||||
BOOST_FUSION_DEFINE_STRUCT_CTOR_ARG_I, \
|
||||
diff --git a/include/boost/fusion/adapted/struct/detail/define_struct_inline.hpp b/include/boost/fusion/adapted/struct/detail/define_struct_inline.hpp
|
||||
index a5a3ae0..a037ffe 100644
|
||||
--- a/include/boost/fusion/adapted/struct/detail/define_struct_inline.hpp
|
||||
+++ b/include/boost/fusion/adapted/struct/detail/define_struct_inline.hpp
|
||||
@@ -66,7 +66,7 @@
|
||||
#define BOOST_FUSION_IGNORE_2(ARG1, ARG2)
|
||||
|
||||
#define BOOST_FUSION_MAKE_COPY_CONSTRUCTOR(NAME, ATTRIBUTES_SEQ) \
|
||||
- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \
|
||||
+ BOOST_FUSION_GPU_ENABLED \
|
||||
NAME(BOOST_PP_SEQ_FOR_EACH_I( \
|
||||
BOOST_FUSION_MAKE_CONST_REF_PARAM, \
|
||||
~, \
|
||||
@@ -337,7 +337,7 @@
|
||||
typedef boost::mpl::int_<N> index; \
|
||||
typedef boost_fusion_detail_Seq sequence_type; \
|
||||
\
|
||||
- BOOST_CONSTEXPR BOOST_FUSION_GPU_ENABLED \
|
||||
+ BOOST_FUSION_GPU_ENABLED \
|
||||
BOOST_FUSION_ITERATOR_NAME(NAME)(boost_fusion_detail_Seq& seq) \
|
||||
: seq_(seq) \
|
||||
BOOST_FUSION_DEFINE_ITERATOR_WKND_INIT_LIST_ENTRIES( \
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
From 42e7869f411a75512fb6994c634eb086fb9eb5cc Mon Sep 17 00:00:00 2001
|
||||
From: Christopher Kohlhoff <chris@kohlhoff.com>
|
||||
Date: Sun, 11 Sep 2016 12:04:18 +1000
|
||||
Subject: [PATCH] Fix allocator usage to compile with g++ 6.
|
||||
|
||||
---
|
||||
include/boost/asio/impl/use_future.hpp | 16 ++++++++++------
|
||||
1 file changed, 10 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/include/boost/asio/impl/use_future.hpp b/include/boost/asio/impl/use_future.hpp
|
||||
index b954e14..92106f4 100644
|
||||
--- a/include/boost/asio/impl/use_future.hpp
|
||||
+++ b/include/boost/asio/impl/use_future.hpp
|
||||
@@ -34,10 +34,12 @@ namespace detail {
|
||||
{
|
||||
public:
|
||||
// Construct from use_future special value.
|
||||
- template <typename Allocator>
|
||||
- promise_handler(use_future_t<Allocator> uf)
|
||||
+ template <typename Alloc>
|
||||
+ promise_handler(use_future_t<Alloc> uf)
|
||||
: promise_(std::allocate_shared<std::promise<T> >(
|
||||
- uf.get_allocator(), std::allocator_arg, uf.get_allocator()))
|
||||
+ typename Alloc::template rebind<char>::other(uf.get_allocator()),
|
||||
+ std::allocator_arg,
|
||||
+ typename Alloc::template rebind<char>::other(uf.get_allocator())))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -66,10 +68,12 @@ namespace detail {
|
||||
{
|
||||
public:
|
||||
// Construct from use_future special value. Used during rebinding.
|
||||
- template <typename Allocator>
|
||||
- promise_handler(use_future_t<Allocator> uf)
|
||||
+ template <typename Alloc>
|
||||
+ promise_handler(use_future_t<Alloc> uf)
|
||||
: promise_(std::allocate_shared<std::promise<void> >(
|
||||
- uf.get_allocator(), std::allocator_arg, uf.get_allocator()))
|
||||
+ typename Alloc::template rebind<char>::other(uf.get_allocator()),
|
||||
+ std::allocator_arg,
|
||||
+ typename Alloc::template rebind<char>::other(uf.get_allocator())))
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
From 8091fbf00ae6953d34b717ab077a041420e5ba43 Mon Sep 17 00:00:00 2001
|
||||
From: Tim Blechmann <tim@klingt.org>
|
||||
Date: Sat, 5 Sep 2015 09:04:32 +0200
|
||||
Subject: [PATCH] heap: binomial heap - fix size handling in pop()
|
||||
|
||||
---
|
||||
include/boost/heap/binomial_heap.hpp | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/include/boost/heap/binomial_heap.hpp b/include/boost/heap/binomial_heap.hpp
|
||||
index 7e0760f..01ccf3f 100644
|
||||
--- a/include/boost/heap/binomial_heap.hpp
|
||||
+++ b/include/boost/heap/binomial_heap.hpp
|
||||
@@ -404,8 +404,13 @@ class binomial_heap:
|
||||
binomial_heap children(value_comp(), element->children, sz);
|
||||
if (trees.empty()) {
|
||||
stability_counter_type stability_count = super_t::get_stability_count();
|
||||
+ size_t size = constant_time_size ? size_holder::get_size()
|
||||
+ : 0;
|
||||
swap(children);
|
||||
super_t::set_stability_count(stability_count);
|
||||
+
|
||||
+ if (constant_time_size)
|
||||
+ size_holder::set_size( size );
|
||||
} else
|
||||
merge_and_clear_nodes(children);
|
||||
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
From ca2ff08600fa63c8dea90897cfe649427bf58a6e Mon Sep 17 00:00:00 2001
|
||||
From: Nasos <nasos_i@hotmail.com>
|
||||
Date: Wed, 5 Aug 2015 10:17:51 -0400
|
||||
Subject: [PATCH] Corrected inline issue in storage.hpp
|
||||
|
||||
---
|
||||
include/boost/numeric/ublas/storage.hpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/boost/numeric/ublas/storage.hpp b/include/boost/numeric/ublas/storage.hpp
|
||||
index 8821309..19bc907 100644
|
||||
--- a/include/boost/numeric/ublas/storage.hpp
|
||||
+++ b/include/boost/numeric/ublas/storage.hpp
|
||||
@@ -777,8 +777,8 @@ namespace boost { namespace numeric { namespace ublas {
|
||||
BOOST_UBLAS_INLINE
|
||||
shallow_array_adaptor (size_type size, pointer data):
|
||||
size_ (size), own_ (false), data_ (data, leaker<value_type> ()) {}
|
||||
- BOOST_UBLAS_INLINE
|
||||
template <size_t N>
|
||||
+ BOOST_UBLAS_INLINE
|
||||
shallow_array_adaptor (T (&data)[N]):
|
||||
size_ (N), own_ (false), data_ (data, leaker<value_type> ()) {}
|
||||
|
||||
From b805369990aed13a2c837f642a280a7b6352e012 Mon Sep 17 00:00:00 2001
|
||||
From: Nasos <nasos_i@hotmail.com>
|
||||
Date: Wed, 5 Aug 2015 10:31:25 -0400
|
||||
Subject: [PATCH] Corrected inline issue in storage.hpp
|
||||
|
||||
---
|
||||
include/boost/numeric/ublas/storage.hpp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/include/boost/numeric/ublas/storage.hpp b/include/boost/numeric/ublas/storage.hpp
|
||||
index 19bc907..bd64892 100644
|
||||
--- a/include/boost/numeric/ublas/storage.hpp
|
||||
+++ b/include/boost/numeric/ublas/storage.hpp
|
||||
@@ -833,13 +833,13 @@ namespace boost { namespace numeric { namespace ublas {
|
||||
void resize (size_type size, pointer data, value_type init) {
|
||||
resize_internal (size, data, init, true);
|
||||
}
|
||||
- BOOST_UBLAS_INLINE
|
||||
template <size_t N>
|
||||
+ BOOST_UBLAS_INLINE
|
||||
void resize (T (&data)[N]) {
|
||||
resize_internal (N, data, value_type (), false);
|
||||
}
|
||||
- BOOST_UBLAS_INLINE
|
||||
template <size_t N>
|
||||
+ BOOST_UBLAS_INLINE
|
||||
void resize (T (&data)[N], value_type init) {
|
||||
resize_internal (N, data, init, true);
|
||||
}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
--- boost_1_58_0/tools/build/src/tools/gcc.jam~ 2015-07-17 15:14:57.381636224 +0100
|
||||
+++ boost_1_58_0/tools/build/src/tools/gcc.jam 2015-07-27 17:35:29.122264048 +0100
|
||||
@@ -421,7 +421,9 @@
|
||||
|
||||
rule setup-address-model ( targets * : sources * : properties * )
|
||||
{
|
||||
- local model = [ feature.get-values address-model : $(properties) ] ;
|
||||
+ # For RPM builds the address model flag is passed in %{optflags}.
|
||||
+ # local model = [ feature.get-values address-model : $(properties) ] ;
|
||||
+ local model ;
|
||||
if $(model)
|
||||
{
|
||||
local option ;
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
commit 2b2cc6543c44beeb8331dc8e1a7eff2e071a8cc8
|
||||
Author: Antony Polukhin <antoshkka@gmail.com>
|
||||
Date: Sun May 10 21:53:27 2015 +0300
|
||||
|
||||
Fix error with missing include, that was found by Maarten de Vries
|
||||
|
||||
diff --git a/include/boost/variant/detail/element_index.hpp b/include/boost/variant/detail/element_index.hpp
|
||||
index bd80bdd..842b018 100644
|
||||
--- a/include/boost/variant/detail/element_index.hpp
|
||||
+++ b/include/boost/variant/detail/element_index.hpp
|
||||
@@ -16,6 +16,7 @@
|
||||
#include "boost/variant/recursive_wrapper_fwd.hpp"
|
||||
#include "boost/variant/variant_fwd.hpp"
|
||||
|
||||
+#include "boost/type_traits/remove_cv.hpp"
|
||||
#include "boost/mpl/find_if.hpp"
|
||||
|
||||
namespace boost { namespace detail { namespace variant {
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
http://lists.boost.org/Archives/boost/2015/02/220155.php
|
||||
|
||||
commit d19baee73f90de01375af69a9f8621799c649964
|
||||
Author: Edward Nevill <edward.nevill_at_[hidden]>
|
||||
Date: Mon Feb 23 17:32:49 2015 +0000
|
||||
|
||||
Fix build for aarch64.
|
||||
|
||||
|
||||
Index: boost_1_57_0/libs/context/build/Jamfile.v2
|
||||
===================================================================
|
||||
--- boost_1_57_0.orig/libs/context/build/Jamfile.v2
|
||||
+++ boost_1_57_0/libs/context/build/Jamfile.v2
|
||||
@@ -214,7 +214,7 @@ alias asm_context_sources
|
||||
alias asm_context_sources
|
||||
: [ make asm/make_arm64_aapcs_elf_gas.o : asm/make_arm64_aapcs_elf_gas.S : @gas64 ]
|
||||
[ make asm/jump_arm64_aapcs_elf_gas.o : asm/jump_arm64_aapcs_elf_gas.S : @gas64 ]
|
||||
- : <abi>aapcs
|
||||
+ : <abi>sysv
|
||||
<address-model>64
|
||||
<architecture>arm
|
||||
<binary-format>elf
|
||||
@@ -223,7 +223,7 @@ alias asm_context_sources
|
||||
alias asm_context_sources
|
||||
: asm/make_arm64_aapcs_elf_gas.S
|
||||
asm/jump_arm64_aapcs_elf_gas.S
|
||||
- : <abi>aapcs
|
||||
+ : <abi>sysv
|
||||
<address-model>64
|
||||
<architecture>arm
|
||||
<binary-format>elf
|
||||
@@ -233,7 +233,7 @@ alias asm_context_sources
|
||||
alias asm_context_sources
|
||||
: asm/make_arm64_aapcs_elf_gas.S
|
||||
asm/jump_arm64_aapcs_elf_gas.S
|
||||
- : <abi>aapcs
|
||||
+ : <abi>sysv
|
||||
<address-model>64
|
||||
<architecture>arm
|
||||
<binary-format>elf
|
||||
132
boost.spec
132
boost.spec
|
|
@ -32,7 +32,7 @@ Name: boost
|
|||
Summary: The free peer-reviewed portable C++ source libraries
|
||||
Version: 1.58.0
|
||||
%define version_enc 1_58_0
|
||||
Release: 1%{?dist}
|
||||
Release: 12%{?dist}
|
||||
License: Boost and MIT and Python
|
||||
|
||||
%define toplev_dirname %{name}_%{version_enc}
|
||||
|
|
@ -77,14 +77,14 @@ Requires: boost-timer%{?_isa} = %{version}-%{release}
|
|||
Requires: boost-wave%{?_isa} = %{version}-%{release}
|
||||
|
||||
BuildRequires: m4
|
||||
BuildRequires: libstdc++-devel%{?_isa}
|
||||
BuildRequires: bzip2-devel%{?_isa}
|
||||
BuildRequires: zlib-devel%{?_isa}
|
||||
BuildRequires: python-devel%{?_isa}
|
||||
BuildRequires: libstdc++-devel
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: python-devel
|
||||
%if %{with python3}
|
||||
BuildRequires: python3-devel%{?_isa}
|
||||
BuildRequires: python3-devel
|
||||
%endif
|
||||
BuildRequires: libicu-devel%{?_isa}
|
||||
BuildRequires: libicu-devel
|
||||
|
||||
# https://svn.boost.org/trac/boost/ticket/6150
|
||||
Patch4: boost-1.50.0-fix-non-utf8-files.patch
|
||||
|
|
@ -124,7 +124,24 @@ Patch65: boost-1.57.0-build-optflags.patch
|
|||
# https://svn.boost.org/trac/boost/ticket/10510
|
||||
Patch66: boost-1.57.0-uuid-comparison.patch
|
||||
|
||||
Patch78: boost-context-use-sysv-not-aapcs.patch
|
||||
# https://svn.boost.org/trac/boost/ticket/11283
|
||||
Patch67: boost-1.58.0-variant-includes.patch
|
||||
|
||||
# Prevent gcc.jam from setting -m32 or -m64.
|
||||
Patch68: boost-1.58.0-address-model.patch
|
||||
|
||||
# https://github.com/boostorg/ublas/pull/25
|
||||
Patch69: boost-1.58-ublas-inlines.patch
|
||||
|
||||
Patch70: 0001-Changes-required-for-aarch64-support-in-boost-config.patch
|
||||
|
||||
#http://www.boost.org/patches/1_58_0/0002-Fix-a-regression-with-non-constexpr-types.patch
|
||||
Patch80: 0002-Fix-a-regression-with-non-constexpr-types.patch
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1294515
|
||||
Patch81: boost-1.58-binomial_heap.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1403165
|
||||
Patch85: boost-1.58-asio-use-future.patch
|
||||
|
||||
%bcond_with tests
|
||||
%bcond_with docs_generated
|
||||
|
|
@ -462,7 +479,6 @@ This package contains example source files distributed with boost.
|
|||
%package openmpi
|
||||
Summary: Run-Time component of Boost.MPI library
|
||||
Group: System Environment/Libraries
|
||||
Requires: openmpi%{?_isa}
|
||||
BuildRequires: openmpi-devel
|
||||
Requires: boost-serialization%{?_isa} = %{version}-%{release}
|
||||
|
||||
|
|
@ -517,7 +533,6 @@ back-end to do the parallel work.
|
|||
%package mpich
|
||||
Summary: Run-Time component of Boost.MPI library
|
||||
Group: System Environment/Libraries
|
||||
Requires: mpich%{?_isa}
|
||||
BuildRequires: mpich-devel
|
||||
Requires: boost-serialization%{?_isa} = %{version}-%{release}
|
||||
Provides: boost-mpich2 = %{version}-%{release}
|
||||
|
|
@ -588,6 +603,16 @@ creating static and shared libraries, making pieces of executable, and other
|
|||
chores -- whether you're using GCC, MSVC, or a dozen more supported
|
||||
C++ compilers -- on Windows, OSX, Linux and commercial UNIX systems.
|
||||
|
||||
%package doctools
|
||||
Summary: Tools for working with Boost documentation
|
||||
Group: Applications/Publishing
|
||||
Requires: docbook-dtds
|
||||
Requires: docbook-style-xsl
|
||||
|
||||
%description doctools
|
||||
|
||||
Tools for working with Boost documentation in BoostBook or QuickBook format.
|
||||
|
||||
%package jam
|
||||
Summary: A low-level build tool
|
||||
Group: Development/Tools
|
||||
|
|
@ -613,7 +638,13 @@ a number of significant features and is now developed independently
|
|||
%patch63 -p1
|
||||
%patch65 -p1
|
||||
%patch66 -p2
|
||||
%patch78 -p1
|
||||
%patch67 -p2
|
||||
%patch68 -p1
|
||||
%patch69 -p2
|
||||
%patch70 -p1
|
||||
%patch80 -p2
|
||||
%patch81 -p2
|
||||
%patch85 -p2
|
||||
|
||||
# At least python2_version needs to be a macro so that it's visible in
|
||||
# %%install as well.
|
||||
|
|
@ -672,8 +703,7 @@ echo ============================= build serial ==================
|
|||
variant=release threading=multi debug-symbols=on pch=off \
|
||||
python=%{python2_version} stage
|
||||
|
||||
# See boost-1.54.0-thread-link_atomic.patch for where this file comes
|
||||
# from.
|
||||
# See libs/thread/build/Jamfile.v2 for where this file comes from.
|
||||
if [ $(find serial -type f -name has_atomic_flag_lockfree \
|
||||
-print -quit | wc -l) -ne 0 ]; then
|
||||
DEF=D
|
||||
|
|
@ -803,6 +833,19 @@ echo ============================= install Boost.Build ==================
|
|||
%{__install} -p -m 644 v2/doc/bjam.1 -D $RPM_BUILD_ROOT%{_mandir}/man1/bjam.1
|
||||
)
|
||||
|
||||
echo ============================= install Boost.QuickBook ==================
|
||||
(cd tools/quickbook
|
||||
../build/b2 --prefix=$RPM_BUILD_ROOT%{_prefix}
|
||||
%{__install} -p -m 755 ../../dist/bin/quickbook $RPM_BUILD_ROOT%{_bindir}/
|
||||
cd ../boostbook
|
||||
find dtd -type f -name '*.dtd' | while read tobeinstalledfiles; do
|
||||
install -p -m 644 $tobeinstalledfiles -D $RPM_BUILD_ROOT%{_datadir}/boostbook/$tobeinstalledfiles
|
||||
done
|
||||
find xsl -type f | while read tobeinstalledfiles; do
|
||||
install -p -m 644 $tobeinstalledfiles -D $RPM_BUILD_ROOT%{_datadir}/boostbook/$tobeinstalledfiles
|
||||
done
|
||||
)
|
||||
|
||||
# Install documentation files (HTML pages) within the temporary place
|
||||
echo ============================= install documentation ==================
|
||||
# Prepare the place to temporary store the generated documentation
|
||||
|
|
@ -967,6 +1010,30 @@ rm -rf $RPM_BUILD_ROOT
|
|||
|
||||
%postun wave -p /sbin/ldconfig
|
||||
|
||||
%post doctools
|
||||
CATALOG=%{_sysconfdir}/xml/catalog
|
||||
%{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
|
||||
"http://www.boost.org/tools/boostbook/dtd" \
|
||||
"file://%{_datadir}/boostbook/dtd" $CATALOG
|
||||
%{_bindir}/xmlcatalog --noout --add "rewriteURI" \
|
||||
"http://www.boost.org/tools/boostbook/dtd" \
|
||||
"file://%{_datadir}/boostbook/dtd" $CATALOG
|
||||
%{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
|
||||
"http://www.boost.org/tools/boostbook/xsl" \
|
||||
"file://%{_datadir}/boostbook/xsl" $CATALOG
|
||||
%{_bindir}/xmlcatalog --noout --add "rewriteURI" \
|
||||
"http://www.boost.org/tools/boostbook/xsl" \
|
||||
"file://%{_datadir}/boostbook/xsl" $CATALOG
|
||||
|
||||
%postun doctools
|
||||
# remove entries only on removal of package
|
||||
if [ "$1" = 0 ]; then
|
||||
CATALOG=%{_sysconfdir}/xml/catalog
|
||||
%{_bindir}/xmlcatalog --noout --del \
|
||||
"file://%{_datadir}/boostbook/dtd" $CATALOG
|
||||
%{_bindir}/xmlcatalog --noout --del \
|
||||
"file://%{_datadir}/boostbook/xsl" $CATALOG
|
||||
fi
|
||||
|
||||
|
||||
%files
|
||||
|
|
@ -1226,6 +1293,12 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%doc LICENSE_1_0.txt
|
||||
%{_datadir}/boost-build/
|
||||
|
||||
%files doctools
|
||||
%defattr(-, root, root, -)
|
||||
%license LICENSE_1_0.txt
|
||||
%{_bindir}/quickbook
|
||||
%{_datadir}/boostbook/
|
||||
|
||||
%files jam
|
||||
%defattr(-, root, root, -)
|
||||
%doc LICENSE_1_0.txt
|
||||
|
|
@ -1233,6 +1306,39 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%{_mandir}/man1/bjam.1*
|
||||
|
||||
%changelog
|
||||
* Fri Dec 09 2016 Jonathan Wakely <jwakely@redhat.com> - 1.58.0-12
|
||||
- Add patch for Boost.Asio to fix allocator usage (#1403165)
|
||||
|
||||
* Fri Jan 15 2016 Jonathan Wakely <jwakely@redhat.com> 1.58.0-11
|
||||
- Add patch for binomial_heap::pop (#1294515)
|
||||
|
||||
* Tue Dec 22 2015 Jonathan Wakely <jwakely@redhat.com> 1.58.0-10
|
||||
- Add boost-doctools subpackage (#1244268).
|
||||
|
||||
* Fri Dec 04 2015 Jonathan Wakely <jwakely@redhat.com> 1.58.0-9
|
||||
- do not use arch-specific BuildRequires (#1268267)
|
||||
|
||||
* Mon Aug 31 2015 Jonathan Wakely <jwakely@redhat.com> 1.58.0-8
|
||||
- Add patch for Boost.Fusion bug.
|
||||
|
||||
* Fri Aug 21 2015 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 1.58.0-7
|
||||
- Re-enable boost::context on AArch64.
|
||||
|
||||
* Sat Aug 15 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.58.0-6
|
||||
- Rebuild for MPI provides
|
||||
|
||||
* Mon Aug 10 2015 Sandro Mani <manisandro@gmail.com> - 1.58.0-5
|
||||
- Rebuild for RPM MPI Requires Provides Change
|
||||
|
||||
* Sat Aug 08 2015 Jonathan Wakely <jwakely@redhat.com> 1.58.0-4
|
||||
- Patch incorrect placement of BOOST_UBLAS_INLINE macros.
|
||||
|
||||
* Tue Aug 04 2015 Jonathan Wakely <jwakely@redhat.com> 1.58.0-3
|
||||
- Patch to prevent address model being set by Boost.Build.
|
||||
|
||||
* Mon Jul 27 2015 Jonathan Wakely <jwakely@redhat.com> 1.58.0-2
|
||||
- Patch for missing include (boost-1.58.0-variant-includes.patch).
|
||||
|
||||
* Fri Jul 17 2015 Jonathan Wakely <jwakely@redhat.com> - 1.58.0-1
|
||||
- Rebase to 1.58.0
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue