]> git.pld-linux.org Git - packages/boost.git/blob - boost-1.54.0-thread-link_atomic.patch
- rel 3; bunch of upstream patches (taken and filtered by FC team)
[packages/boost.git] / boost-1.54.0-thread-link_atomic.patch
1 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
2 --- boost_1_54_0/libs/thread/build/has_atomic_flag_lockfree_test.cpp    1970-01-01 01:00:00.000000000 +0100
3 +++ boost_1_54_0.pm/libs/thread/build/has_atomic_flag_lockfree_test.cpp 2013-08-23 19:51:52.706329968 +0200
4 @@ -0,0 +1,14 @@
5 +// Copyright (c) 2013, Petr Machata, Red Hat Inc.
6 +//
7 +// Use modification and distribution are subject to the boost Software
8 +// License, Version 1.0.  (See http://www.boost.org/LICENSE_1_0.txt).
9 +
10 +#include "../../../boost/atomic.hpp"
11 +#include "../../../boost/static_assert.hpp"
12 +
13 +int
14 +main(int argc, char *argv[])
15 +{
16 +  BOOST_STATIC_ASSERT(BOOST_ATOMIC_FLAG_LOCK_FREE);
17 +  return 0;
18 +}
19 diff -Nurp boost_1_54_0/libs/thread/build/Jamfile.v2 boost_1_54_0.pm/libs/thread/build/Jamfile.v2
20 --- boost_1_54_0/libs/thread/build/Jamfile.v2   2013-06-15 12:35:45.000000000 +0200
21 +++ boost_1_54_0.pm/libs/thread/build/Jamfile.v2        2013-08-23 19:52:30.018613408 +0200
22 @@ -36,6 +36,7 @@ import os ;
23  import feature ;
24  import indirect ;
25  import path ;
26 +import configure ;
27  
28  project boost/thread
29      : source-location ../src
30 @@ -140,6 +141,8 @@ local rule default_threadapi ( )
31  feature.feature threadapi : pthread win32 : propagated ;
32  feature.set-default threadapi : [ default_threadapi ] ;
33  
34 +exe has_atomic_flag_lockfree : ../build/has_atomic_flag_lockfree_test.cpp ;
35 +
36  rule tag ( name : type ? : property-set )
37  {
38      local result = $(name) ;
39 @@ -248,6 +251,12 @@ rule requirements ( properties * )
40  {
41      local result ;
42  
43 +    if ! [ configure.builds has_atomic_flag_lockfree
44 +          : $(properties) : "lockfree boost::atomic_flag" ]
45 +    {
46 +        result += <library>/boost/atomic//boost_atomic ;
47 +    }
48 +
49      if <threadapi>pthread in $(properties)
50      {
51          result += <define>BOOST_THREAD_POSIX ;
This page took 0.024011 seconds and 3 git commands to generate.