diff options
author | Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de> | 2013-12-05 08:58:18 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-09 18:01:45 +0000 |
commit | 5a018ee669869d20b51c120c2cd3f8cb4a0031e5 (patch) | |
tree | 96beb99d3d76bc25fb17dc8449f7b8f14c90927e /meta/recipes-support/boost/files | |
parent | 1907b10106bd0b26d53d22d84973cfee68c1c5c2 (diff) | |
download | poky-5a018ee669869d20b51c120c2cd3f8cb4a0031e5.tar.gz |
boost: updating to 1.55.0
When updating to 1.55.0, the backport patches for recent versions of
glibc and linking boost-thread to boost-atomic were removed, as they
have been added to the current version.
Although the arm-intrinsics.patch is reported with Status: Backport,
it was not merged to version 1.55.0 yet.
The boost recipe for 1.55.0 was tested intensively for the different
qemu machines with the meta-ros layer, which uses boost in various
recipes. During the compilation, no errors were discovered.
(From OE-Core rev: e0bc74e14f7ad67ff85959ce7c0a111d05ac7f2f)
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/boost/files')
-rw-r--r-- | meta/recipes-support/boost/files/boost-1.54.0-thread-link_atomic.patch | 59 | ||||
-rw-r--r-- | meta/recipes-support/boost/files/glibc.patch | 26 |
2 files changed, 0 insertions, 85 deletions
diff --git a/meta/recipes-support/boost/files/boost-1.54.0-thread-link_atomic.patch b/meta/recipes-support/boost/files/boost-1.54.0-thread-link_atomic.patch deleted file mode 100644 index 62af3d1aa3..0000000000 --- a/meta/recipes-support/boost/files/boost-1.54.0-thread-link_atomic.patch +++ /dev/null | |||
@@ -1,59 +0,0 @@ | |||
1 | Link boost_thread with boost_atomic to avoid undefined references to | ||
2 | boost::atomic::detail::lock_pool::get_lock_for(). | ||
3 | |||
4 | From https://svn.boost.org/trac/boost/ticket/9041 | ||
5 | |||
6 | Phil Blundell <pb@pbcl.net> | ||
7 | Upstream-Status: Backport | ||
8 | |||
9 | diff -Nurp boost_1_54_0/libs/thread/build/has_atomic_flag_lockfree_test.cpp boost_1_54_0.pm/libs/thread/build/has_atomic_flag_lockfree_test.cpp | ||
10 | --- boost_1_54_0/libs/thread/build/has_atomic_flag_lockfree_test.cpp 1970-01-01 01:00:00.000000000 +0100 | ||
11 | +++ boost_1_54_0.pm/libs/thread/build/has_atomic_flag_lockfree_test.cpp 2013-08-23 19:51:52.706329968 +0200 | ||
12 | @@ -0,0 +1,14 @@ | ||
13 | +// Copyright (c) 2013, Petr Machata, Red Hat Inc. | ||
14 | +// | ||
15 | +// Use modification and distribution are subject to the boost Software | ||
16 | +// License, Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt). | ||
17 | + | ||
18 | +#include "../../../boost/atomic.hpp" | ||
19 | +#include "../../../boost/static_assert.hpp" | ||
20 | + | ||
21 | +int | ||
22 | +main(int argc, char *argv[]) | ||
23 | +{ | ||
24 | + BOOST_STATIC_ASSERT(BOOST_ATOMIC_FLAG_LOCK_FREE); | ||
25 | + return 0; | ||
26 | +} | ||
27 | diff -Nurp boost_1_54_0/libs/thread/build/Jamfile.v2 boost_1_54_0.pm/libs/thread/build/Jamfile.v2 | ||
28 | --- boost_1_54_0/libs/thread/build/Jamfile.v2 2013-06-15 12:35:45.000000000 +0200 | ||
29 | +++ boost_1_54_0.pm/libs/thread/build/Jamfile.v2 2013-08-23 19:52:30.018613408 +0200 | ||
30 | @@ -36,6 +36,7 @@ import os ; | ||
31 | import feature ; | ||
32 | import indirect ; | ||
33 | import path ; | ||
34 | +import configure ; | ||
35 | |||
36 | project boost/thread | ||
37 | : source-location ../src | ||
38 | @@ -140,6 +141,8 @@ local rule default_threadapi ( ) | ||
39 | feature.feature threadapi : pthread win32 : propagated ; | ||
40 | feature.set-default threadapi : [ default_threadapi ] ; | ||
41 | |||
42 | +exe has_atomic_flag_lockfree : ../build/has_atomic_flag_lockfree_test.cpp ; | ||
43 | + | ||
44 | rule tag ( name : type ? : property-set ) | ||
45 | { | ||
46 | local result = $(name) ; | ||
47 | @@ -248,6 +251,12 @@ rule requirements ( properties * ) | ||
48 | { | ||
49 | local result ; | ||
50 | |||
51 | + if ! [ configure.builds has_atomic_flag_lockfree | ||
52 | + : $(properties) : "lockfree boost::atomic_flag" ] | ||
53 | + { | ||
54 | + result += <library>/boost/atomic//boost_atomic ; | ||
55 | + } | ||
56 | + | ||
57 | if <threadapi>pthread in $(properties) | ||
58 | { | ||
59 | result += <define>BOOST_THREAD_POSIX ; | ||
diff --git a/meta/recipes-support/boost/files/glibc.patch b/meta/recipes-support/boost/files/glibc.patch deleted file mode 100644 index c33ea64713..0000000000 --- a/meta/recipes-support/boost/files/glibc.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | ------------------------------------------------------------------------ | ||
2 | r84950 | johnmaddock | 2013-07-04 02:13:23 -0700 (Thu, 04 Jul 2013) | 2 lines | ||
3 | |||
4 | Patch for recent versions of glibc which always assume int64_t support. | ||
5 | Fixes #8731. | ||
6 | |||
7 | Upstream-Status: Backport | ||
8 | |||
9 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
10 | |||
11 | Index: boost_1_54_0/boost/cstdint.hpp | ||
12 | =================================================================== | ||
13 | --- boost_1_54_0.orig/boost/cstdint.hpp | ||
14 | +++ boost_1_54_0/boost/cstdint.hpp | ||
15 | @@ -41,7 +41,10 @@ | ||
16 | // so we disable use of stdint.h when GLIBC does not define __GLIBC_HAVE_LONG_LONG. | ||
17 | // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990 | ||
18 | // | ||
19 | -#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG)) | ||
20 | +#if defined(BOOST_HAS_STDINT_H) \ | ||
21 | + && (!defined(__GLIBC__) \ | ||
22 | + || defined(__GLIBC_HAVE_LONG_LONG) \ | ||
23 | + || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17))))) | ||
24 | |||
25 | // The following #include is an implementation artifact; not part of interface. | ||
26 | # ifdef __hpux | ||