summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorLukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>2013-12-05 08:58:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-09 18:01:45 +0000
commit5a018ee669869d20b51c120c2cd3f8cb4a0031e5 (patch)
tree96beb99d3d76bc25fb17dc8449f7b8f14c90927e /meta
parent1907b10106bd0b26d53d22d84973cfee68c1c5c2 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-support/boost/bjam-native_1.55.0.bb (renamed from meta/recipes-support/boost/bjam-native_1.54.0.bb)0
-rw-r--r--meta/recipes-support/boost/boost-1.55.0.inc (renamed from meta/recipes-support/boost/boost-1.54.0.inc)4
-rw-r--r--meta/recipes-support/boost/boost_1.54.0.bb7
-rw-r--r--meta/recipes-support/boost/boost_1.55.0.bb4
-rw-r--r--meta/recipes-support/boost/files/boost-1.54.0-thread-link_atomic.patch59
-rw-r--r--meta/recipes-support/boost/files/glibc.patch26
6 files changed, 6 insertions, 94 deletions
diff --git a/meta/recipes-support/boost/bjam-native_1.54.0.bb b/meta/recipes-support/boost/bjam-native_1.55.0.bb
index 59a031032c..59a031032c 100644
--- a/meta/recipes-support/boost/bjam-native_1.54.0.bb
+++ b/meta/recipes-support/boost/bjam-native_1.55.0.bb
diff --git a/meta/recipes-support/boost/boost-1.54.0.inc b/meta/recipes-support/boost/boost-1.55.0.inc
index 9113c825db..7daadb6c9e 100644
--- a/meta/recipes-support/boost/boost-1.54.0.inc
+++ b/meta/recipes-support/boost/boost-1.55.0.inc
@@ -13,7 +13,7 @@ BOOST_P = "boost_${BOOST_VER}"
13 13
14SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2" 14SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2"
15 15
16SRC_URI[md5sum] = "15cb8c0803064faef0c4ddf5bc5ca279" 16SRC_URI[md5sum] = "d6eef4b4cacb2183f2bf265a5a03a354"
17SRC_URI[sha256sum] = "047e927de336af106a24bceba30069980c191529fd76b8dff8eb9a328b48ae1d" 17SRC_URI[sha256sum] = "fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52"
18 18
19S = "${WORKDIR}/${BOOST_P}" 19S = "${WORKDIR}/${BOOST_P}"
diff --git a/meta/recipes-support/boost/boost_1.54.0.bb b/meta/recipes-support/boost/boost_1.54.0.bb
deleted file mode 100644
index 9e7a60a805..0000000000
--- a/meta/recipes-support/boost/boost_1.54.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1include boost-${PV}.inc
2include boost.inc
3
4SRC_URI += "file://arm-intrinsics.patch \
5 file://glibc.patch \
6 file://boost-1.54.0-thread-link_atomic.patch \
7 "
diff --git a/meta/recipes-support/boost/boost_1.55.0.bb b/meta/recipes-support/boost/boost_1.55.0.bb
new file mode 100644
index 0000000000..b199c88577
--- /dev/null
+++ b/meta/recipes-support/boost/boost_1.55.0.bb
@@ -0,0 +1,4 @@
1include boost-${PV}.inc
2include boost.inc
3
4SRC_URI += "file://arm-intrinsics.patch"
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 @@
1Link boost_thread with boost_atomic to avoid undefined references to
2boost::atomic::detail::lock_pool::get_lock_for().
3
4From https://svn.boost.org/trac/boost/ticket/9041
5
6Phil Blundell <pb@pbcl.net>
7Upstream-Status: Backport
8
9diff -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+}
27diff -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------------------------------------------------------------------------
2r84950 | johnmaddock | 2013-07-04 02:13:23 -0700 (Thu, 04 Jul 2013) | 2 lines
3
4Patch for recent versions of glibc which always assume int64_t support.
5Fixes #8731.
6
7Upstream-Status: Backport
8
9Signed-off-by: Saul Wold <sgw@linux.intel.com>
10
11Index: 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