Compare commits
86 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
c6c9a85f21 | ||
|
139c6b50e6 | ||
|
1499fdf972 | ||
|
6534bae05f | ||
|
3cee16030b | ||
|
af66f9c00c | ||
|
299d009cc0 | ||
|
32555bac58 | ||
|
a4629aecca | ||
|
e556fceb05 | ||
|
1a524340e6 | ||
|
9aae0c8a00 | ||
|
b4c96119f1 | ||
|
3946a4a4b0 | ||
|
dc827b0935 | ||
|
b59c4b6666 | ||
|
4c456d525c | ||
|
47b8c9cad1 | ||
|
d50c552e84 | ||
|
7387f7d55f | ||
|
90138276af | ||
|
747d6e8fe2 | ||
|
1885d22687 | ||
|
5c4a0e07d3 | ||
|
9497c27f10 | ||
|
4c79bb2181 | ||
|
b634b3b0c8 | ||
|
cc95da10da | ||
|
b9e2eb12e9 | ||
|
91d3fad8f3 | ||
|
83bcf8daf2 | ||
|
d04833457b | ||
|
d185c08009 | ||
|
efff732f4f | ||
|
6e3f05c5de | ||
|
c54b0a0c9e | ||
|
91387222f5 | ||
|
a4b6003a94 | ||
|
30150eaf49 | ||
|
a919cdd969 | ||
|
7ace5f0128 | ||
|
218cc61036 | ||
|
59415588c8 | ||
|
6d2d8199e5 | ||
|
3da9bab88b | ||
|
d2c3a27558 | ||
|
e1dabc540b | ||
|
51c6915fb4 | ||
|
b9ad2bf8a2 | ||
|
733a71ce66 | ||
|
eb5a2d18d6 | ||
|
92f6971ea7 | ||
|
22ace9c9e6 | ||
|
0b594070c7 | ||
|
f9cbc68d43 | ||
|
310c56bc25 | ||
|
4672342671 | ||
|
f9845a940f | ||
|
b0ac251dd9 | ||
|
c7e4b76204 | ||
|
c2efae682b | ||
|
263025eccd | ||
|
93bdb8dad9 | ||
|
92a4e21c1a | ||
|
faf2199734 | ||
|
3c75cd19c7 | ||
|
94638715d9 | ||
|
5effd9fcd9 | ||
|
66eafe3099 | ||
|
d8ec5cd0e8 | ||
|
a59457fcda | ||
|
20123c5e6f | ||
|
3d13bdbd4b | ||
|
fb630fe1a0 | ||
|
7d5037b77f | ||
|
51fe9e0ae4 | ||
|
c779362f9f | ||
|
b7bc8de355 | ||
|
e283993866 | ||
|
b86f78331a | ||
|
a1b6b50100 | ||
|
2665c69e3a | ||
|
49492cb891 | ||
|
71b2be77a7 | ||
|
b30dad1db5 | ||
|
bf768ffd04 |
@ -1,12 +0,0 @@
|
||||
diff --git a/libs/math/config/has_long_double_support.cpp b/libs/math/config/has_long_double_support.cpp
|
||||
index d314cf3..9022408 100644
|
||||
--- a/libs/math/config/has_long_double_support.cpp
|
||||
+++ b/libs/math/config/has_long_double_support.cpp
|
||||
@@ -8,3 +8,7 @@
|
||||
#ifdef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
|
||||
#error "long double support is not supported by Boost.Math on this Plaform: the long double version of the TR1 library will not be built."
|
||||
#endif
|
||||
+
|
||||
+int main(int argc, char *argv[]) {
|
||||
+ return 0;
|
||||
+}
|
@ -1,57 +0,0 @@
|
||||
--- boost_1_53_0/libs/context/src/asm/make_ppc32_sysv_elf_gas.S.orig 2013-02-11 14:03:46.631005713 -0600
|
||||
+++ boost_1_53_0/libs/context/src/asm/make_ppc32_sysv_elf_gas.S 2013-02-11 14:06:52.704815403 -0600
|
||||
@@ -87,12 +87,10 @@
|
||||
subi %r0, %r3, 64 # reserve 64 bytes (linkage + parameter area), R4 % 16 == 0
|
||||
stw %r0, 76(%r3) # save address in R3 as stack pointer for context function
|
||||
|
||||
- mflr %r0 # load LR
|
||||
bl 1f # jump to label 1
|
||||
1:
|
||||
mflr %r4 # load LR into R4
|
||||
addi %r4, %r4, finish - 1b # compute abs address of label finish
|
||||
- mtlr %r0 # restore LR
|
||||
stw %r4, 84(%r3) # save address of finish as return address for context function
|
||||
# entered after context function returns
|
||||
|
||||
@@ -108,4 +106,5 @@
|
||||
|
||||
li %r3, 0 # exit code is zero
|
||||
bl _exit@plt # exit application
|
||||
+ .long 0 # We should never get here, so SIGILL if we do
|
||||
.size make_fcontext, .-make_fcontext
|
||||
|
||||
--- boost_1_53_0/libs/context/src/asm/make_ppc64_sysv_elf_gas.S.orig 2013-02-11 14:03:43.726849715 -0600
|
||||
+++ boost_1_53_0/libs/context/src/asm/make_ppc64_sysv_elf_gas.S 2013-02-11 14:22:48.202839078 -0600
|
||||
@@ -99,21 +99,19 @@
|
||||
|
||||
# call align_stack, R3 contains address at 16 byte boundary after return
|
||||
# == pointer to fcontext_t and address of context stack
|
||||
- rlwinm %r3, %r3, 0, 0, 59
|
||||
+ clrrdi %r3, %r3, 4
|
||||
|
||||
std %r0, 184(%r3) # save address of context stack (base) in fcontext_t
|
||||
std %r4, 192(%r3) # save context stack size in fcontext_t
|
||||
std %r5, 176(%r3) # save address of context function in fcontext_t
|
||||
|
||||
- subf %r0, %r3, 64 # 64 bytes on stack for parameter area (== 8 registers)
|
||||
+ subi %r0, %r3, 64 # 64 bytes on stack for parameter area (== 8 registers)
|
||||
std %r0, 152(%r3) # save the stack base
|
||||
|
||||
- mflr %r0 # load LR
|
||||
bl 1f # jump to label 1
|
||||
1:
|
||||
mflr %r4 # load LR into R4
|
||||
addi %r4, %r4, finish - 1b # compute abs address of label finish
|
||||
- mtlr %r0 # restore LR
|
||||
std %r4, 168(%r3) # save address of finish as return address for context function
|
||||
# entered after context function returns
|
||||
|
||||
@@ -128,5 +126,7 @@
|
||||
stwu %r1, -32(%r1) # allocate stack space, SP % 16 == 0
|
||||
|
||||
li %r3, 0 # set return value to zero
|
||||
- bl _exit@plt # exit application
|
||||
+ bl _exit # exit application
|
||||
+ nop # nop is required by the linker
|
||||
+ .long 0 # We should never get here, so SIGILL if we do
|
||||
.size .make_fcontext, .-.make_fcontext
|
@ -1,14 +0,0 @@
|
||||
diff -up ./boost/pool/pool.hpp~ ./boost/pool/pool.hpp
|
||||
--- ./boost/pool/pool.hpp~ 2013-08-21 17:49:56.023296922 +0200
|
||||
+++ ./boost/pool/pool.hpp 2013-08-22 11:38:01.133912638 +0200
|
||||
@@ -361,9 +361,7 @@ class pool: protected simple_segregated_
|
||||
{ //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool.
|
||||
size_type partition_size = alloc_size();
|
||||
size_type POD_size = math::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type);
|
||||
- size_type max_chunks = (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
|
||||
-
|
||||
- return max_chunks;
|
||||
+ return (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
|
||||
}
|
||||
|
||||
static void * & nextof(void * const ptr)
|
@ -1,15 +0,0 @@
|
||||
diff -up boost_1_53_0/boost/python/to_python_value.hpp\~ boost_1_53_0/boost/python/to_python_value.hpp
|
||||
--- boost_1_53_0/boost/python/to_python_value.hpp~ 2007-12-16 11:12:07.000000000 +0100
|
||||
+++ boost_1_53_0/boost/python/to_python_value.hpp 2013-07-23 16:19:02.518904596 +0200
|
||||
@@ -147,8 +147,8 @@ namespace detail
|
||||
template <class T>
|
||||
inline PyObject* registry_to_python_value<T>::operator()(argument_type x) const
|
||||
{
|
||||
- typedef converter::registered<argument_type> r;
|
||||
# if BOOST_WORKAROUND(__GNUC__, < 3)
|
||||
+ typedef converter::registered<argument_type> r;
|
||||
// suppresses an ICE, somehow
|
||||
(void)r::converters;
|
||||
# endif
|
||||
|
||||
Diff finished. Tue Jul 23 16:19:05 2013
|
@ -1,98 +0,0 @@
|
||||
diff -up boost_1_55_0/libs/python/test/exec.cpp\~ boost_1_55_0/libs/python/test/exec.cpp
|
||||
--- boost_1_55_0/libs/python/test/exec.cpp~ 2010-07-05 00:38:38.000000000 +0200
|
||||
+++ boost_1_55_0/libs/python/test/exec.cpp 2015-01-09 21:31:12.903218280 +0100
|
||||
@@ -56,6 +56,20 @@ void eval_test()
|
||||
BOOST_TEST(value == "ABCDEFG");
|
||||
}
|
||||
|
||||
+struct PyCtx
|
||||
+{
|
||||
+ PyCtx() {
|
||||
+ Py_Initialize();
|
||||
+ }
|
||||
+
|
||||
+ ~PyCtx() {
|
||||
+ // N.B. certain problems may arise when Py_Finalize is called when
|
||||
+ // using Boost.Python. However in this test suite it all seems to
|
||||
+ // work fine.
|
||||
+ Py_Finalize();
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
void exec_test()
|
||||
{
|
||||
// Register the module with the interpreter
|
||||
@@ -68,6 +82,8 @@ void exec_test()
|
||||
) == -1)
|
||||
throw std::runtime_error("Failed to add embedded_hello to the interpreter's "
|
||||
"builtin modules");
|
||||
+
|
||||
+ PyCtx ctx;
|
||||
// Retrieve the main module
|
||||
python::object main = python::import("__main__");
|
||||
|
||||
@@ -148,41 +164,43 @@ void check_pyerr(bool pyerr_expected=fal
|
||||
}
|
||||
}
|
||||
|
||||
+template <class Cb>
|
||||
+bool
|
||||
+run_and_handle_exception(Cb cb, bool pyerr_expected = false)
|
||||
+{
|
||||
+ PyCtx ctx;
|
||||
+ if (python::handle_exception(cb)) {
|
||||
+ check_pyerr(pyerr_expected);
|
||||
+ return true;
|
||||
+ } else {
|
||||
+ return false;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
BOOST_TEST(argc == 2 || argc == 3);
|
||||
std::string script = argv[1];
|
||||
- // Initialize the interpreter
|
||||
- Py_Initialize();
|
||||
|
||||
- if (python::handle_exception(eval_test)) {
|
||||
- check_pyerr();
|
||||
- }
|
||||
- else if(python::handle_exception(exec_test)) {
|
||||
- check_pyerr();
|
||||
- }
|
||||
- else if (python::handle_exception(boost::bind(exec_file_test, script))) {
|
||||
+ // N.B. exec_test mustn't be called through run_and_handle_exception
|
||||
+ // as it needs to handles the python context by itself.
|
||||
+ if (run_and_handle_exception(eval_test)
|
||||
+ || python::handle_exception(exec_test))
|
||||
check_pyerr();
|
||||
- }
|
||||
-
|
||||
- if (python::handle_exception(exec_test_error))
|
||||
- {
|
||||
- check_pyerr(/*pyerr_expected*/ true);
|
||||
- }
|
||||
else
|
||||
- {
|
||||
+ run_and_handle_exception(boost::bind(exec_file_test, script));
|
||||
+
|
||||
+ if (!run_and_handle_exception(exec_test_error, true))
|
||||
BOOST_ERROR("Python exception expected, but not seen.");
|
||||
- }
|
||||
|
||||
if (argc > 2) {
|
||||
+ PyCtx ctx;
|
||||
// The main purpose is to test compilation. Since this test generates
|
||||
// a file and I (rwgk) am uncertain about the side-effects, run it only
|
||||
// if explicitly requested.
|
||||
exercise_embedding_html();
|
||||
}
|
||||
|
||||
- // Boost.Python doesn't support Py_Finalize yet.
|
||||
- // Py_Finalize();
|
||||
return boost::report_errors();
|
||||
}
|
||||
|
||||
|
||||
Diff finished. Fri Jan 9 21:31:13 2015
|
@ -1,20 +0,0 @@
|
||||
diff -up ./move/core.hpp~ ./move/core.hpp
|
||||
--- boost/move/core.hpp~ 2015-02-09 17:33:35.000000000 +0100
|
||||
+++ boost/move/core.hpp 2015-02-13 13:54:52.012130813 +0100
|
||||
@@ -43,6 +43,7 @@
|
||||
#if defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED)
|
||||
|
||||
#include <boost/move/detail/meta_utils.hpp>
|
||||
+ #include <boost/type_traits/is_class.hpp>
|
||||
|
||||
//Move emulation rv breaks standard aliasing rules so add workarounds for some compilers
|
||||
#if defined(__GNUC__) && (__GNUC__ >= 4) && \
|
||||
@@ -65,7 +66,7 @@
|
||||
template <class T>
|
||||
class rv
|
||||
: public ::boost::move_detail::if_c
|
||||
- < ::boost::move_detail::is_class_or_union<T>::value
|
||||
+ < ::boost::is_class<T>::value
|
||||
, T
|
||||
, ::boost::move_detail::nat
|
||||
>::type
|
@ -1,33 +0,0 @@
|
||||
diff -up boost_1_57_0/libs/pool/test/Jamfile.v2\~ boost_1_57_0/libs/pool/test/Jamfile.v2
|
||||
--- boost_1_57_0/libs/pool/test/Jamfile.v2~ 2014-07-10 06:36:10.000000000 +0200
|
||||
+++ boost_1_57_0/libs/pool/test/Jamfile.v2 2015-01-20 13:59:10.818700586 +0100
|
||||
@@ -28,17 +28,17 @@ explicit valgrind_config_check ;
|
||||
local use-valgrind = [ check-target-builds valgrind_config_check "valgrind" : <testing.launcher>"valgrind --error-exitcode=1" : <build>no ] ;
|
||||
|
||||
test-suite pool :
|
||||
- [ run test_simple_seg_storage.cpp ]
|
||||
- [ run test_pool_alloc.cpp ]
|
||||
- [ run pool_msvc_compiler_bug_test.cpp ]
|
||||
- [ run test_msvc_mem_leak_detect.cpp ]
|
||||
- [ run test_bug_3349.cpp ]
|
||||
- [ run test_bug_4960.cpp ]
|
||||
- [ run test_bug_1252.cpp ]
|
||||
- [ run test_bug_2696.cpp ]
|
||||
- [ run test_bug_5526.cpp ]
|
||||
+ [ run test_simple_seg_storage.cpp : : : <library>/boost/system//boost_system ]
|
||||
+ [ run test_pool_alloc.cpp : : : <library>/boost/system//boost_system ]
|
||||
+ [ run pool_msvc_compiler_bug_test.cpp : : : <library>/boost/system//boost_system ]
|
||||
+ [ run test_msvc_mem_leak_detect.cpp : : : <library>/boost/system//boost_system ]
|
||||
+ [ run test_bug_3349.cpp : : : <library>/boost/system//boost_system ]
|
||||
+ [ run test_bug_4960.cpp : : : <library>/boost/system//boost_system ]
|
||||
+ [ run test_bug_1252.cpp : : : <library>/boost/system//boost_system ]
|
||||
+ [ run test_bug_2696.cpp : : : <library>/boost/system//boost_system ]
|
||||
+ [ run test_bug_5526.cpp : : : <library>/boost/system//boost_system ]
|
||||
[ run test_threading.cpp : : : <threading>multi <library>/boost/thread//boost_thread <toolset>gcc:<cxxflags>-Wno-attributes <toolset>gcc:<cxxflags>-Wno-missing-field-initializers ]
|
||||
- [ run ../example/time_pool_alloc.cpp ]
|
||||
+ [ run ../example/time_pool_alloc.cpp : : : <library>/boost/system//boost_system ]
|
||||
[ compile test_poisoned_macros.cpp ]
|
||||
|
||||
#
|
||||
|
||||
Diff finished. Tue Jan 20 13:59:16 2015
|
@ -1,24 +0,0 @@
|
||||
From fd0d8042e2bb2fb5a4d88bcfc700c1cb9d7aa1bb Mon Sep 17 00:00:00 2001
|
||||
From: Frank Mori Hess <fmh6jj@gmail.com>
|
||||
Date: Thu, 6 Nov 2014 23:32:20 -0500
|
||||
Subject: [PATCH] Fix for missing include from Evangelos Foutras.
|
||||
|
||||
---
|
||||
include/boost/signals2/trackable.hpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/include/boost/signals2/trackable.hpp b/include/boost/signals2/trackable.hpp
|
||||
index dba001d..64e8489 100644
|
||||
--- a/include/boost/signals2/trackable.hpp
|
||||
+++ b/include/boost/signals2/trackable.hpp
|
||||
@@ -18,6 +18,7 @@
|
||||
|
||||
#include <boost/assert.hpp>
|
||||
#include <boost/shared_ptr.hpp>
|
||||
+#include <boost/weak_ptr.hpp>
|
||||
|
||||
namespace boost {
|
||||
namespace signals2 {
|
||||
--
|
||||
2.1.0
|
||||
|
@ -1,19 +0,0 @@
|
||||
diff -up boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp\~ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
|
||||
--- boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp~ 2014-10-13 12:21:40.000000000 +0200
|
||||
+++ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp 2015-01-20 13:25:50.069710766 +0100
|
||||
@@ -282,12 +282,12 @@ struct grammar_definition
|
||||
#if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
|
||||
typedef impl::grammar_helper_base<GrammarT> helper_base_t;
|
||||
typedef grammar_helper_list<GrammarT> helper_list_t;
|
||||
- typedef typename helper_list_t::vector_t::reverse_iterator iterator_t;
|
||||
|
||||
helper_list_t& helpers =
|
||||
grammartract_helper_list::do_(self);
|
||||
|
||||
# if defined(BOOST_INTEL_CXX_VERSION)
|
||||
+ typedef typename helper_list_t::vector_t::reverse_iterator iterator_t;
|
||||
for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i)
|
||||
(*i)->undefine(self);
|
||||
# else
|
||||
|
||||
Diff finished. Tue Jan 20 13:25:53 2015
|
@ -1,22 +0,0 @@
|
||||
From fc32eea4ac9e514a7d210306cd9fa3a017dfe02c Mon Sep 17 00:00:00 2001
|
||||
From: VemundH <vehandel@online.no>
|
||||
Date: Tue, 30 Sep 2014 21:53:45 +0200
|
||||
Subject: [PATCH] remove incorrect casts
|
||||
|
||||
---
|
||||
include/boost/uuid/detail/uuid_x86.hpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/boost/uuid/detail/uuid_x86.hpp b/include/boost/uuid/detail/uuid_x86.hpp
|
||||
index 1a329b0..5a2cdec 100644
|
||||
--- a/include/boost/uuid/detail/uuid_x86.hpp
|
||||
+++ b/include/boost/uuid/detail/uuid_x86.hpp
|
||||
@@ -100,7 +100,7 @@ inline bool operator< (uuid const& lhs, uuid const& rhs) BOOST_NOEXCEPT
|
||||
cmp = (cmp - 1u) ^ cmp;
|
||||
rcmp = (rcmp - 1u) ^ rcmp;
|
||||
|
||||
- return static_cast< uint16_t >(cmp) < static_cast< uint16_t >(rcmp);
|
||||
+ return cmp < rcmp;
|
||||
}
|
||||
|
||||
} // namespace uuids
|
31
boost-1.58.0-pool-test_linking.patch
Normal file
31
boost-1.58.0-pool-test_linking.patch
Normal file
@ -0,0 +1,31 @@
|
||||
diff -up boost_1_58_0/libs/pool/test/Jamfile.v2\~ boost_1_58_0/libs/pool/test/Jamfile.v2
|
||||
--- boost_1_57_0/libs/pool/test/Jamfile.v2~ 2015-07-17 11:36:16.362519826 +0100
|
||||
+++ boost_1_57_0/libs/pool/test/Jamfile.v2 2015-07-17 11:37:38.858847388 +0100
|
||||
@@ -28,17 +28,17 @@
|
||||
local Werr = <toolset>gcc:<warnings-as-errors>on <toolset>msvc:<warnings-as-errors>on ;
|
||||
|
||||
test-suite pool :
|
||||
- [ run test_simple_seg_storage.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4267 ]
|
||||
- [ run test_pool_alloc.cpp : : : $(Werr) ]
|
||||
- [ run pool_msvc_compiler_bug_test.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4512 ]
|
||||
- [ run test_msvc_mem_leak_detect.cpp : : : $(Werr) ]
|
||||
- [ run test_bug_3349.cpp : : : $(Werr) ]
|
||||
- [ run test_bug_4960.cpp : : : $(Werr) ]
|
||||
- [ run test_bug_1252.cpp : : : $(Werr) ]
|
||||
- [ run test_bug_2696.cpp : : : $(Werr) ]
|
||||
- [ run test_bug_5526.cpp : : : $(Werr) ]
|
||||
+ [ run test_simple_seg_storage.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4267 <library>/boost/system//boost_system ]
|
||||
+ [ run test_pool_alloc.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||
+ [ run pool_msvc_compiler_bug_test.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4512 <library>/boost/system//boost_system ]
|
||||
+ [ run test_msvc_mem_leak_detect.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||
+ [ run test_bug_3349.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||
+ [ run test_bug_4960.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||
+ [ run test_bug_1252.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||
+ [ run test_bug_2696.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||
+ [ run test_bug_5526.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||
[ run test_threading.cpp : : : <threading>multi <library>/boost/thread//boost_thread ]
|
||||
- [ run ../example/time_pool_alloc.cpp : : : $(Werr) ]
|
||||
+ [ run ../example/time_pool_alloc.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||
[ compile test_poisoned_macros.cpp : $(Werr) ]
|
||||
|
||||
#
|
@ -7,18 +7,16 @@ Index: boost/pool/pool.hpp
|
||||
|
||||
+// std::numeric_limits
|
||||
+#include <boost/limits.hpp>
|
||||
// boost::math::static_lcm
|
||||
#include <boost/math/common_factor_ct.hpp>
|
||||
@@ -358,4 +360,13 @@
|
||||
// boost::integer::static_lcm
|
||||
#include <boost/integer/common_factor_ct.hpp>
|
||||
@@ -358,4 +360,11 @@
|
||||
}
|
||||
|
||||
+ size_type max_chunks() const
|
||||
+ { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool.
|
||||
+ size_type partition_size = alloc_size();
|
||||
+ size_type POD_size = math::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type);
|
||||
+ size_type max_chunks = (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
|
||||
+
|
||||
+ return max_chunks;
|
||||
+ size_type POD_size = integer::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type);
|
||||
+ return (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
|
||||
+ }
|
||||
+
|
||||
static void * & nextof(void * const ptr)
|
87
boost-1.63.0-dual-python-build-v2.patch
Normal file
87
boost-1.63.0-dual-python-build-v2.patch
Normal file
@ -0,0 +1,87 @@
|
||||
--- boost_1_63_0/libs/mpi/build/Jamfile.v2 2016-12-22 06:33:17.000000000 -0600
|
||||
+++ boost_1_63_0/libs/mpi/build/Jamfile.v2 2017-05-19 01:45:05.485563800 -0500
|
||||
@@ -11,6 +11,7 @@
|
||||
import mpi ;
|
||||
import indirect ;
|
||||
import python ;
|
||||
+import feature ;
|
||||
|
||||
libraries = ;
|
||||
|
||||
@@ -53,18 +54,38 @@ lib boost_mpi
|
||||
<library>../../serialization/build//boost_serialization
|
||||
<library>/mpi//mpi [ mpi.extra-requirements ]
|
||||
;
|
||||
+
|
||||
+rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } }
|
||||
|
||||
libraries += boost_mpi ;
|
||||
+rule find-py3-version
|
||||
+{
|
||||
+ local versions = [ feature.values python ] ;
|
||||
+ local py3ver ;
|
||||
+ for local v in $(versions)
|
||||
+ {
|
||||
+ if $(v) >= 3.0
|
||||
+ {
|
||||
+ py3ver = $(v) ;
|
||||
+ }
|
||||
+ }
|
||||
+ return $(py3ver) ;
|
||||
+}
|
||||
+
|
||||
+py3-version = [ find-py3-version ] ;
|
||||
|
||||
if [ python.configured ]
|
||||
{
|
||||
- lib boost_mpi_python
|
||||
+
|
||||
+ rule lib_boost_mpi_python ( is-py3 ? ) {
|
||||
+
|
||||
+ lib [ cond $(is-py3) : boost_mpi_python3 : boost_mpi_python ]
|
||||
: # Sources
|
||||
python/serialize.cpp
|
||||
: # Requirements
|
||||
<library>boost_mpi
|
||||
<library>/mpi//mpi [ mpi.extra-requirements ]
|
||||
- <library>/boost/python//boost_python
|
||||
+ [ cond $(is-py3) : <library>/boost/python//boost_python3 : <library>/boost/python//boost_python ]
|
||||
<link>shared:<define>BOOST_MPI_DYN_LINK=1
|
||||
<link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1
|
||||
<link>shared:<define>BOOST_PYTHON_DYN_LINK=1
|
||||
@@ -76,7 +97,6 @@ libraries += boost_mpi ;
|
||||
: # Usage requirements
|
||||
<library>/mpi//mpi [ mpi.extra-requirements ]
|
||||
;
|
||||
- libraries += boost_mpi_python ;
|
||||
|
||||
python-extension mpi
|
||||
: # Sources
|
||||
@@ -93,8 +113,8 @@ libraries += boost_mpi ;
|
||||
python/status.cpp
|
||||
python/py_timer.cpp
|
||||
: # Requirements
|
||||
- <library>/boost/python//boost_python
|
||||
- <library>boost_mpi_python
|
||||
+ [ cond $(is-py3) : <library>/boost/python//boost_python3 : <library>/boost/python//boost_python ]
|
||||
+ [ cond $(is-py3) : <library>boost_mpi_python3 : <library>boost_mpi_python ]
|
||||
<library>boost_mpi
|
||||
<library>/mpi//mpi [ mpi.extra-requirements ]
|
||||
<link>shared:<define>BOOST_MPI_DYN_LINK=1
|
||||
@@ -102,6 +122,16 @@ libraries += boost_mpi ;
|
||||
<link>shared:<define>BOOST_PYTHON_DYN_LINK=1
|
||||
<link>shared <runtime-link>shared
|
||||
;
|
||||
+ }
|
||||
+
|
||||
+ if $(py3-version) {
|
||||
+ lib_boost_mpi_python yes ;
|
||||
+ libraries += boost_mpi_python3 ;
|
||||
+ } else {
|
||||
+ lib_boost_mpi_python ;
|
||||
+ libraries += boost_mpi_python ;
|
||||
+ }
|
||||
+
|
||||
}
|
||||
}
|
||||
else if ! ( --without-mpi in [ modules.peek : ARGV ] )
|
13
boost-1.66.0-address-model.patch
Normal file
13
boost-1.66.0-address-model.patch
Normal file
@ -0,0 +1,13 @@
|
||||
--- boost_1_66_0/tools/build/src/tools/gcc.jam~ 2018-01-19 13:09:56.041685502 +0000
|
||||
+++ boost_1_66_0/tools/build/src/tools/gcc.jam 2018-01-19 13:09:56.042685500 +0000
|
||||
@@ -421,7 +421,9 @@
|
||||
|
||||
rule set-address-model-options ( 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 ;
|
26
boost-1.66.0-bjam-build-flags.patch
Normal file
26
boost-1.66.0-bjam-build-flags.patch
Normal file
@ -0,0 +1,26 @@
|
||||
--- boost_1_66_0/tools/build/src/engine/build.jam~ 2018-02-07 21:36:14.552201421 +0000
|
||||
+++ boost_1_66_0/tools/build/src/engine/build.jam 2018-02-07 21:36:29.014173266 +0000
|
||||
@@ -4,7 +4,7 @@
|
||||
#~ http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
# Clean env vars of any "extra" empty values.
|
||||
-for local v in ARGV CC CFLAGS LIBS
|
||||
+for local v in ARGV CC CFLAGS LIBS RPM_OPT_FLAGS RPM_LD_FLAGS
|
||||
{
|
||||
local values ;
|
||||
for local x in $($(v))
|
||||
@@ -215,12 +215,12 @@
|
||||
: -L$(--python-lib[1]) -l$(--python-lib[2]) ;
|
||||
## GCC 2.x, 3.x, 4.x
|
||||
toolset gcc gcc : "-o " : -D
|
||||
- : -pedantic -fno-strict-aliasing
|
||||
+ : -pedantic -fno-strict-aliasing $(RPM_OPT_FLAGS)
|
||||
[ opt --release : [ opt --symbols : -g : -s ] -O3 ]
|
||||
[ opt --debug : -g -O0 -fno-inline ]
|
||||
[ opt --profile : -O3 -g -pg ]
|
||||
-I$(--python-include) -I$(--extra-include) -Wno-long-long
|
||||
- : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
|
||||
+ : -L$(--python-lib[1]) -l$(--python-lib[2]) $(RPM_LD_FLAGS) ;
|
||||
## GCC 2.x, 3.x on CYGWIN but without cygwin1.dll
|
||||
toolset gcc-nocygwin gcc : "-o " : -D
|
||||
: -s -O3 -mno-cygwin
|
@ -1,33 +1,5 @@
|
||||
diff -up ./tools/build/src/tools/gcc.jam~ ./tools/build/src/tools/gcc.jam
|
||||
--- ./tools/build/src/tools/gcc.jam~ 2015-02-09 15:01:04.850331626 +0100
|
||||
+++ ./tools/build/src/tools/gcc.jam 2015-02-09 15:44:29.122307134 +0100
|
||||
@@ -366,17 +366,17 @@ generators.override gcc.compile.c++.pch
|
||||
toolset.flags gcc.compile PCH_FILE <pch>on : <pch-file> ;
|
||||
|
||||
# Declare flags and action for compilation.
|
||||
-toolset.flags gcc.compile OPTIONS <optimization>off : -O0 ;
|
||||
-toolset.flags gcc.compile OPTIONS <optimization>speed : -O3 ;
|
||||
-toolset.flags gcc.compile OPTIONS <optimization>space : -Os ;
|
||||
+toolset.flags gcc.compile OPTIONS <optimization>off : ;
|
||||
+toolset.flags gcc.compile OPTIONS <optimization>speed : ;
|
||||
+toolset.flags gcc.compile OPTIONS <optimization>space : ;
|
||||
|
||||
-toolset.flags gcc.compile OPTIONS <inlining>off : -fno-inline ;
|
||||
-toolset.flags gcc.compile OPTIONS <inlining>on : -Wno-inline ;
|
||||
-toolset.flags gcc.compile OPTIONS <inlining>full : -finline-functions -Wno-inline ;
|
||||
+toolset.flags gcc.compile OPTIONS <inlining>off : ;
|
||||
+toolset.flags gcc.compile OPTIONS <inlining>on : ;
|
||||
+toolset.flags gcc.compile OPTIONS <inlining>full : ;
|
||||
|
||||
-toolset.flags gcc.compile OPTIONS <warnings>off : -w ;
|
||||
-toolset.flags gcc.compile OPTIONS <warnings>on : -Wall ;
|
||||
-toolset.flags gcc.compile OPTIONS <warnings>all : -Wall -pedantic ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>off : ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>on : ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>all : ;
|
||||
toolset.flags gcc.compile OPTIONS <warnings-as-errors>on : -Werror ;
|
||||
|
||||
toolset.flags gcc.compile OPTIONS <debug-symbols>on : -g ;
|
||||
--- boost_1_66_0/tools/build/src/tools/gcc.jam~ 2017-12-13 23:56:50.000000000 +0000
|
||||
+++ boost_1_66_0/tools/build/src/tools/gcc.jam 2018-01-19 12:48:26.264755316 +0000
|
||||
@@ -603,7 +603,7 @@ rule compile.fortran ( targets * : sourc
|
||||
|
||||
actions compile.c++ bind PCH_FILE
|
||||
@ -46,3 +18,32 @@ diff -up ./tools/build/src/tools/gcc.jam~ ./tools/build/src/tools/gcc.jam
|
||||
}
|
||||
|
||||
actions compile.c.preprocess bind PCH_FILE
|
||||
@@ -755,17 +755,17 @@ actions compile.c.pch
|
||||
###
|
||||
|
||||
# Declare flags and action for compilation.
|
||||
-toolset.flags gcc.compile OPTIONS <optimization>off : -O0 ;
|
||||
-toolset.flags gcc.compile OPTIONS <optimization>speed : -O3 ;
|
||||
-toolset.flags gcc.compile OPTIONS <optimization>space : -Os ;
|
||||
-
|
||||
-toolset.flags gcc.compile OPTIONS <inlining>off : -fno-inline ;
|
||||
-toolset.flags gcc.compile OPTIONS <inlining>on : -Wno-inline ;
|
||||
-toolset.flags gcc.compile OPTIONS <inlining>full : -finline-functions -Wno-inline ;
|
||||
-
|
||||
-toolset.flags gcc.compile OPTIONS <warnings>off : -w ;
|
||||
-toolset.flags gcc.compile OPTIONS <warnings>on : -Wall ;
|
||||
-toolset.flags gcc.compile OPTIONS <warnings>all : -Wall -pedantic ;
|
||||
+toolset.flags gcc.compile OPTIONS <optimization>off : ;
|
||||
+toolset.flags gcc.compile OPTIONS <optimization>speed : ;
|
||||
+toolset.flags gcc.compile OPTIONS <optimization>space : ;
|
||||
+
|
||||
+toolset.flags gcc.compile OPTIONS <inlining>off : ;
|
||||
+toolset.flags gcc.compile OPTIONS <inlining>on : ;
|
||||
+toolset.flags gcc.compile OPTIONS <inlining>full : ;
|
||||
+
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>off : ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>on : ;
|
||||
+toolset.flags gcc.compile OPTIONS <warnings>all : ;
|
||||
toolset.flags gcc.compile OPTIONS <warnings-as-errors>on : -Werror ;
|
||||
|
||||
toolset.flags gcc.compile OPTIONS <debug-symbols>on : -g ;
|
23
boost-1.66.0-compute.patch
Normal file
23
boost-1.66.0-compute.patch
Normal file
@ -0,0 +1,23 @@
|
||||
From fdbdb94db64e888fce90fe519be23c2a4396a82e Mon Sep 17 00:00:00 2001
|
||||
From: pradeep <pradeep@arrayfire.com>
|
||||
Date: Tue, 8 May 2018 14:53:38 +0530
|
||||
Subject: [PATCH 1/2] Fix return var qualifier in svm_ptr::get_context
|
||||
|
||||
Lack of `const` qualifier is throwing errors with GCC 8.1
|
||||
---
|
||||
include/boost/compute/memory/svm_ptr.hpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/boost/compute/memory/svm_ptr.hpp b/include/boost/compute/memory/svm_ptr.hpp
|
||||
index c8753f5b..56cf1268 100644
|
||||
--- a/include/boost/compute/memory/svm_ptr.hpp
|
||||
+++ b/include/boost/compute/memory/svm_ptr.hpp
|
||||
@@ -126,7 +126,7 @@ class svm_ptr
|
||||
return m_ptr - other.m_ptr;
|
||||
}
|
||||
|
||||
- context& get_context() const
|
||||
+ const context& get_context() const
|
||||
{
|
||||
return m_context;
|
||||
}
|
20
boost-1.66.0-no-rpath.patch
Normal file
20
boost-1.66.0-no-rpath.patch
Normal file
@ -0,0 +1,20 @@
|
||||
--- boost_1_66_0/tools/build/src/tools/gcc.jam~ 2018-01-19 13:23:45.361330881 +0000
|
||||
+++ boost_1_66_0/tools/build/src/tools/gcc.jam 2018-01-19 13:23:45.362330880 +0000
|
||||
@@ -1191,7 +1191,7 @@ rule link ( targets * : sources * : prop
|
||||
|
||||
actions link bind LIBRARIES
|
||||
{
|
||||
- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
|
||||
+ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
|
||||
}
|
||||
|
||||
rule link.dll ( targets * : sources * : properties * )
|
||||
@@ -1204,7 +1204,7 @@ rule link.dll ( targets * : sources * :
|
||||
# Differs from 'link' above only by -shared.
|
||||
actions link.dll bind LIBRARIES
|
||||
{
|
||||
- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
|
||||
+ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
|
||||
}
|
||||
|
||||
###
|
@ -49,8 +49,8 @@
|
||||
extension-suffix ?= "" ;
|
||||
+ abi-letters ?= "" ;
|
||||
|
||||
# Normalize and dissect any version number.
|
||||
local major-minor ;
|
||||
local cmds-to-try ;
|
||||
|
||||
@@ -922,7 +923,7 @@ local rule configure ( version ? : cmd-o
|
||||
}
|
||||
else
|
39
boost-1.66.0-python37.patch
Normal file
39
boost-1.66.0-python37.patch
Normal file
@ -0,0 +1,39 @@
|
||||
From 660487c43fde76f3e64f1cb2e644500da92fe582 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch>
|
||||
Date: Fri, 9 Feb 2018 18:20:30 +0100
|
||||
Subject: [PATCH] Fix build with Python 3.7
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Python 3.7 changes the return type of _PyUnicode_AsString()
|
||||
from void* to const char* -- causing the build of boost-python
|
||||
to fail.
|
||||
|
||||
Signed-off-by: Bernhard Rosenkränzer <bero@lindev.ch>
|
||||
---
|
||||
src/converter/builtin_converters.cpp | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/converter/builtin_converters.cpp b/src/converter/builtin_converters.cpp
|
||||
index 1c28af7fc..ee2d5b479 100644
|
||||
--- a/libs/python/src/converter/builtin_converters.cpp
|
||||
+++ b/libs/python/src/converter/builtin_converters.cpp
|
||||
@@ -45,11 +45,16 @@ namespace
|
||||
{
|
||||
return PyString_Check(obj) ? PyString_AsString(obj) : 0;
|
||||
}
|
||||
-#else
|
||||
+#elif PY_VERSION_HEX < 0x03070000
|
||||
void* convert_to_cstring(PyObject* obj)
|
||||
{
|
||||
return PyUnicode_Check(obj) ? _PyUnicode_AsString(obj) : 0;
|
||||
}
|
||||
+#else
|
||||
+ void* convert_to_cstring(PyObject* obj)
|
||||
+ {
|
||||
+ return PyUnicode_Check(obj) ? const_cast<void*>(reinterpret_cast<const void*>(_PyUnicode_AsString(obj))) : 0;
|
||||
+ }
|
||||
#endif
|
||||
|
||||
// Given a target type and a SlotPolicy describing how to perform a
|
15
boost-1.66.0-spirit-abs-overflow.patch
Normal file
15
boost-1.66.0-spirit-abs-overflow.patch
Normal file
@ -0,0 +1,15 @@
|
||||
--- boost_1_66_0/boost/spirit/home/karma/numeric/detail/numeric_utils.hpp~ 2018-02-23 16:59:53.785141676 +0000
|
||||
+++ boost_1_66_0/boost/spirit/home/karma/numeric/detail/numeric_utils.hpp 2018-02-23 17:00:16.838092946 +0000
|
||||
@@ -68,7 +68,11 @@
|
||||
typedef unsignedtype type; \
|
||||
static type call(signedtype n) \
|
||||
{ \
|
||||
- return static_cast<unsignedtype>((n >= 0) ? n : -n); \
|
||||
+ if (n >= 0) \
|
||||
+ return n; \
|
||||
+ if (n == std::numeric_limits<signedtype>::min()) \
|
||||
+ return (unsignedtype)n; \
|
||||
+ return (unsignedtype)(-n); \
|
||||
} \
|
||||
} \
|
||||
/**/
|
1338
boost.spec
1338
boost.spec
File diff suppressed because it is too large
Load Diff
2
sources
2
sources
@ -1 +1 @@
|
||||
1be49befbdd9a5ce9def2983ba3e7b76 boost_1_57_0.tar.bz2
|
||||
SHA512 (boost_1_66_0.tar.bz2) = 0f34075d35391d66876e5189a01a11880a79428e1b267456348ee148dba9dc3abdc74d568f1853be631d20b584b1c804b42443c266f7622164acfc10be3dab8b
|
||||
|
Loading…
Reference in New Issue
Block a user