diff options
Diffstat (limited to 'meta/recipes-support/boost')
-rw-r--r-- | meta/recipes-support/boost/boost-jam-native.inc | 32 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost-jam-native_3.1.18.bb | 8 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost.inc (renamed from meta/recipes-support/boost/boost-36.inc) | 42 | ||||
-rw-r--r-- | meta/recipes-support/boost/boost_1.47.0.bb (renamed from meta/recipes-support/boost/boost_1.44.0.bb) | 13 | ||||
-rw-r--r-- | meta/recipes-support/boost/files/1.34.1-gcc43.patch | 226 | ||||
-rw-r--r-- | meta/recipes-support/boost/files/atomic_count_gcc_atomicity.patch | 15 | ||||
-rw-r--r-- | meta/recipes-support/boost/files/gcc41.patch | 16 | ||||
-rw-r--r-- | meta/recipes-support/boost/files/gcc43.patch | 258 | ||||
-rw-r--r-- | meta/recipes-support/boost/files/linux-uclibc.patch | 12 | ||||
-rw-r--r-- | meta/recipes-support/boost/files/unit_test_log10f.patch | 22 |
10 files changed, 43 insertions, 601 deletions
diff --git a/meta/recipes-support/boost/boost-jam-native.inc b/meta/recipes-support/boost/boost-jam-native.inc deleted file mode 100644 index c5a9d99b9b..0000000000 --- a/meta/recipes-support/boost/boost-jam-native.inc +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | # The Boost web site provides free peer-reviewed portable | ||
2 | # C++ source libraries. The emphasis is on libraries which | ||
3 | # work well with the C++ Standard Library. The libraries are | ||
4 | # intended to be widely useful, and are in regular use by | ||
5 | # thousands of programmers across a broad spectrum of applications. | ||
6 | DESCRIPTION = "Make system for boost (native)" | ||
7 | HOMEPAGE = "http://www.boost.org/" | ||
8 | SECTION = "devel" | ||
9 | LICENSE = "Boost" | ||
10 | INC_PR = "r1" | ||
11 | |||
12 | LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" | ||
13 | |||
14 | SRC_URI = "${SOURCEFORGE_MIRROR}/boost/boost-jam-${PV}.tgz" | ||
15 | S = "${WORKDIR}/boost-jam-${PV}" | ||
16 | |||
17 | inherit native | ||
18 | |||
19 | do_compile() { | ||
20 | set -ex | ||
21 | rm -rf bin.* | ||
22 | ./build.sh gcc | ||
23 | } | ||
24 | |||
25 | # This is too terrible - the build script doesn't give any good | ||
26 | # way I can see to find out where the binaries are placed, so | ||
27 | # rely on only one bin.foo directory being created. | ||
28 | do_install () { | ||
29 | set -ex | ||
30 | install -d ${D}${bindir}/ | ||
31 | install -c -m 755 bin.*/bjam ${D}${bindir}/ | ||
32 | } | ||
diff --git a/meta/recipes-support/boost/boost-jam-native_3.1.18.bb b/meta/recipes-support/boost/boost-jam-native_3.1.18.bb deleted file mode 100644 index 7a0b1a8699..0000000000 --- a/meta/recipes-support/boost/boost-jam-native_3.1.18.bb +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | include boost-jam-native.inc | ||
2 | |||
3 | PR = "${INC_PR}.0" | ||
4 | |||
5 | SRC_URI = "${SOURCEFORGE_MIRROR}/boost/boost-jam-${PV}.tgz" | ||
6 | |||
7 | SRC_URI[md5sum] = "f790e022d658db38db5cc4aeeccad3f1" | ||
8 | SRC_URI[sha256sum] = "85dbb72c29837ba89cb5408782c82459b34fdecaedea8b54ce1cb3cb9990121a" | ||
diff --git a/meta/recipes-support/boost/boost-36.inc b/meta/recipes-support/boost/boost.inc index 8b0622f6ba..ddb65b754d 100644 --- a/meta/recipes-support/boost/boost-36.inc +++ b/meta/recipes-support/boost/boost.inc | |||
@@ -6,15 +6,22 @@ | |||
6 | DESCRIPTION = "Free peer-reviewed portable C++ source libraries" | 6 | DESCRIPTION = "Free peer-reviewed portable C++ source libraries" |
7 | HOMEPAGE = "http://www.boost.org/" | 7 | HOMEPAGE = "http://www.boost.org/" |
8 | SECTION = "libs" | 8 | SECTION = "libs" |
9 | DEPENDS = "boost-jam-native zlib" | 9 | DEPENDS = "boost-native zlib" |
10 | DEPENDS_virtclass-native = "" | ||
10 | LICENSE = "Boost" | 11 | LICENSE = "Boost" |
11 | PR = "r4" | ||
12 | 12 | ||
13 | ARM_INSTRUCTION_SET = "arm" | 13 | ARM_INSTRUCTION_SET = "arm" |
14 | |||
14 | BOOST_VER = "${@"_".join(d.getVar("PV",1).split("."))}" | 15 | BOOST_VER = "${@"_".join(d.getVar("PV",1).split("."))}" |
15 | BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}" | 16 | BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}" |
16 | BOOST_P = "boost_${BOOST_VER}" | 17 | BOOST_P = "boost_${BOOST_VER}" |
17 | 18 | ||
19 | INC_PR = "r0" | ||
20 | |||
21 | SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BOOST_P}.tar.bz2" | ||
22 | |||
23 | S = "${WORKDIR}/${BOOST_P}" | ||
24 | |||
18 | BOOST_LIBS = "\ | 25 | BOOST_LIBS = "\ |
19 | date_time \ | 26 | date_time \ |
20 | filesystem \ | 27 | filesystem \ |
@@ -37,8 +44,6 @@ BOOST_LIBS = "\ | |||
37 | #PYTHON_ROOT = "${STAGING_DIR_HOST}/${prefix}" | 44 | #PYTHON_ROOT = "${STAGING_DIR_HOST}/${prefix}" |
38 | #PYTHON_VERSION = "2.5" | 45 | #PYTHON_VERSION = "2.5" |
39 | 46 | ||
40 | S = "${WORKDIR}/${BOOST_P}" | ||
41 | |||
42 | # Make a package for each library, plus -dev | 47 | # Make a package for each library, plus -dev |
43 | PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}" | 48 | PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}" |
44 | python __anonymous () { | 49 | python __anonymous () { |
@@ -148,3 +153,32 @@ do_install() { | |||
148 | --includedir=${D}${includedir} \ | 153 | --includedir=${D}${includedir} \ |
149 | install | 154 | install |
150 | } | 155 | } |
156 | |||
157 | BBCLASSEXTEND = "native" | ||
158 | |||
159 | do_configure_virtclass-native() { | ||
160 | : | ||
161 | } | ||
162 | |||
163 | do_boostconfig_virtclass-native() { | ||
164 | : | ||
165 | } | ||
166 | |||
167 | do_compile_virtclass-native() { | ||
168 | set -ex | ||
169 | cd ${S}/tools/build/v2/engine | ||
170 | rm -rf bin.* | ||
171 | ./build.sh gcc | ||
172 | } | ||
173 | |||
174 | # This is too terrible - the build script doesn't give any good | ||
175 | # way I can see to find out where the binaries are placed, so | ||
176 | # rely on only one bin.foo directory being created. | ||
177 | do_install_virtclass-native () { | ||
178 | set -ex | ||
179 | cd ${S}/tools/build/v2/engine | ||
180 | install -d ${D}${bindir}/ | ||
181 | install -c -m 755 bin.*/bjam ${D}${bindir}/ | ||
182 | } | ||
183 | |||
184 | |||
diff --git a/meta/recipes-support/boost/boost_1.44.0.bb b/meta/recipes-support/boost/boost_1.47.0.bb index 722149d710..e1e0ca18fa 100644 --- a/meta/recipes-support/boost/boost_1.44.0.bb +++ b/meta/recipes-support/boost/boost_1.47.0.bb | |||
@@ -1,16 +1,13 @@ | |||
1 | include boost-36.inc | 1 | include boost.inc |
2 | 2 | ||
3 | LICENSE = "Boost" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" | 3 | LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c" |
5 | 4 | ||
6 | PR = "r0" | 5 | PR = "${INC_PR}.0" |
7 | 6 | ||
8 | SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2 \ | 7 | SRC_URI += "file://arm-intrinsics.patch" |
9 | file://arm-intrinsics.patch \ | ||
10 | " | ||
11 | 8 | ||
12 | SRC_URI[md5sum] = "f02578f5218f217a9f20e9c30e119c6a" | 9 | SRC_URI[md5sum] = "a2dc343f7bc7f83f8941e47ed4a18200" |
13 | SRC_URI[sha256sum] = "45c328029d97d1f1dc7ff8c9527cd0c5cc356636084a800bca2ee4bfab1978db" | 10 | SRC_URI[sha256sum] = "815a5d9faac4dbd523fbcf3fe1065e443c0bbf43427c44aa423422c6ec4c2e31" |
14 | 11 | ||
15 | BJAM_OPTS = '${BJAM_TOOLS} \ | 12 | BJAM_OPTS = '${BJAM_TOOLS} \ |
16 | --builddir=${S}/${TARGET_SYS} \ | 13 | --builddir=${S}/${TARGET_SYS} \ |
diff --git a/meta/recipes-support/boost/files/1.34.1-gcc43.patch b/meta/recipes-support/boost/files/1.34.1-gcc43.patch deleted file mode 100644 index 172e19ab09..0000000000 --- a/meta/recipes-support/boost/files/1.34.1-gcc43.patch +++ /dev/null | |||
@@ -1,226 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Index: boost_1_34_1/boost/archive/polymorphic_iarchive.hpp | ||
4 | =================================================================== | ||
5 | --- boost_1_34_1.orig/boost/archive/polymorphic_iarchive.hpp 2005-12-11 07:12:51.000000000 +0100 | ||
6 | +++ boost_1_34_1/boost/archive/polymorphic_iarchive.hpp 2008-09-20 20:55:21.000000000 +0200 | ||
7 | @@ -17,6 +17,7 @@ | ||
8 | // See http://www.boost.org for updates, documentation, and revision history. | ||
9 | |||
10 | #include <cstddef> // std::size_t | ||
11 | +#include <climits> | ||
12 | #include <boost/config.hpp> | ||
13 | |||
14 | #if defined(BOOST_NO_STDC_NAMESPACE) | ||
15 | Index: boost_1_34_1/boost/archive/polymorphic_oarchive.hpp | ||
16 | =================================================================== | ||
17 | --- boost_1_34_1.orig/boost/archive/polymorphic_oarchive.hpp 2006-02-12 06:43:06.000000000 +0100 | ||
18 | +++ boost_1_34_1/boost/archive/polymorphic_oarchive.hpp 2008-09-20 20:55:21.000000000 +0200 | ||
19 | @@ -17,6 +17,7 @@ | ||
20 | // See http://www.boost.org for updates, documentation, and revision history. | ||
21 | |||
22 | #include <cstddef> // size_t | ||
23 | +#include <climits> | ||
24 | #include <string> | ||
25 | |||
26 | #include <boost/config.hpp> | ||
27 | Index: boost_1_34_1/boost/date_time/date_facet.hpp | ||
28 | =================================================================== | ||
29 | --- boost_1_34_1.orig/boost/date_time/date_facet.hpp 2005-09-05 23:10:50.000000000 +0200 | ||
30 | +++ boost_1_34_1/boost/date_time/date_facet.hpp 2008-09-20 20:55:21.000000000 +0200 | ||
31 | @@ -429,7 +429,7 @@ | ||
32 | typedef std::basic_string<CharT> string_type; | ||
33 | typedef CharT char_type; | ||
34 | typedef boost::date_time::period_parser<date_type, CharT> period_parser_type; | ||
35 | - typedef special_values_parser<date_type,CharT> special_values_parser_type; | ||
36 | + typedef boost::date_time::special_values_parser<date_type,CharT> special_values_parser_type; | ||
37 | typedef std::vector<std::basic_string<CharT> > input_collection_type; | ||
38 | typedef format_date_parser<date_type, CharT> format_date_parser_type; | ||
39 | // date_generators stuff goes here | ||
40 | Index: boost_1_34_1/boost/mpl/zip_view.hpp | ||
41 | =================================================================== | ||
42 | --- boost_1_34_1.orig/boost/mpl/zip_view.hpp 2004-09-02 17:40:42.000000000 +0200 | ||
43 | +++ boost_1_34_1/boost/mpl/zip_view.hpp 2008-09-20 20:55:21.000000000 +0200 | ||
44 | @@ -37,7 +37,7 @@ | ||
45 | typedef zip_iterator< | ||
46 | typename transform1< | ||
47 | IteratorSeq | ||
48 | - , next<_1> | ||
49 | + , boost::mpl::next<_1> | ||
50 | >::type | ||
51 | > next; | ||
52 | }; | ||
53 | @@ -48,8 +48,8 @@ | ||
54 | struct zip_view | ||
55 | { | ||
56 | private: | ||
57 | - typedef typename transform1< Sequences, begin<_1> >::type first_ones_; | ||
58 | - typedef typename transform1< Sequences, end<_1> >::type last_ones_; | ||
59 | + typedef typename transform1< Sequences, boost::mpl::begin<_1> >::type first_ones_; | ||
60 | + typedef typename transform1< Sequences, boost::mpl::end<_1> >::type last_ones_; | ||
61 | |||
62 | public: | ||
63 | typedef nested_begin_end_tag tag; | ||
64 | Index: boost_1_34_1/boost/python/detail/def_helper.hpp | ||
65 | =================================================================== | ||
66 | --- boost_1_34_1.orig/boost/python/detail/def_helper.hpp 2004-09-16 03:00:28.000000000 +0200 | ||
67 | +++ boost_1_34_1/boost/python/detail/def_helper.hpp 2008-09-20 20:55:21.000000000 +0200 | ||
68 | @@ -155,7 +155,7 @@ | ||
69 | , T3 const& | ||
70 | , T4 const& | ||
71 | , default_call_policies | ||
72 | - , keywords<0> | ||
73 | + , boost::python::detail::keywords<0> | ||
74 | , char const* | ||
75 | , void(not_specified::*)() // A function pointer type which is never an | ||
76 | // appropriate default implementation | ||
77 | Index: boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp | ||
78 | =================================================================== | ||
79 | --- boost_1_34_1.orig/boost/regex/v4/basic_regex_creator.hpp 2006-07-16 18:06:38.000000000 +0200 | ||
80 | +++ boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp 2008-09-20 20:55:21.000000000 +0200 | ||
81 | @@ -24,6 +24,8 @@ | ||
82 | # include BOOST_ABI_PREFIX | ||
83 | #endif | ||
84 | |||
85 | +#include <climits> | ||
86 | + | ||
87 | namespace boost{ | ||
88 | |||
89 | namespace re_detail{ | ||
90 | Index: boost_1_34_1/boost/regex/v4/basic_regex.hpp | ||
91 | =================================================================== | ||
92 | --- boost_1_34_1.orig/boost/regex/v4/basic_regex.hpp 2007-06-05 19:28:18.000000000 +0200 | ||
93 | +++ boost_1_34_1/boost/regex/v4/basic_regex.hpp 2008-09-20 20:55:21.000000000 +0200 | ||
94 | @@ -23,6 +23,8 @@ | ||
95 | # include BOOST_ABI_PREFIX | ||
96 | #endif | ||
97 | |||
98 | +#include <climits> | ||
99 | + | ||
100 | namespace boost{ | ||
101 | #ifdef BOOST_MSVC | ||
102 | #pragma warning(push) | ||
103 | Index: boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp | ||
104 | =================================================================== | ||
105 | --- boost_1_34_1.orig/boost/regex/v4/basic_regex_parser.hpp 2006-12-20 18:19:05.000000000 +0100 | ||
106 | +++ boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp 2008-09-20 20:55:21.000000000 +0200 | ||
107 | @@ -23,6 +23,8 @@ | ||
108 | # include BOOST_ABI_PREFIX | ||
109 | #endif | ||
110 | |||
111 | +#include <climits> | ||
112 | + | ||
113 | namespace boost{ | ||
114 | namespace re_detail{ | ||
115 | |||
116 | Index: boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp | ||
117 | =================================================================== | ||
118 | --- boost_1_34_1.orig/boost/regex/v4/cpp_regex_traits.hpp 2007-01-15 12:09:44.000000000 +0100 | ||
119 | +++ boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp 2008-09-20 20:55:21.000000000 +0200 | ||
120 | @@ -41,6 +41,7 @@ | ||
121 | |||
122 | #include <istream> | ||
123 | #include <ios> | ||
124 | +#include <climits> | ||
125 | |||
126 | #ifdef BOOST_HAS_ABI_HEADERS | ||
127 | # include BOOST_ABI_PREFIX | ||
128 | Index: boost_1_34_1/boost/regex/v4/perl_matcher.hpp | ||
129 | =================================================================== | ||
130 | --- boost_1_34_1.orig/boost/regex/v4/perl_matcher.hpp 2006-10-18 14:55:30.000000000 +0200 | ||
131 | +++ boost_1_34_1/boost/regex/v4/perl_matcher.hpp 2008-09-20 20:55:21.000000000 +0200 | ||
132 | @@ -18,6 +18,8 @@ | ||
133 | # include BOOST_ABI_PREFIX | ||
134 | #endif | ||
135 | |||
136 | +#include <climits> | ||
137 | + | ||
138 | namespace boost{ | ||
139 | namespace re_detail{ | ||
140 | |||
141 | Index: boost_1_34_1/boost/regex/v4/regex_split.hpp | ||
142 | =================================================================== | ||
143 | --- boost_1_34_1.orig/boost/regex/v4/regex_split.hpp 2005-01-21 18:22:38.000000000 +0100 | ||
144 | +++ boost_1_34_1/boost/regex/v4/regex_split.hpp 2008-09-20 20:55:21.000000000 +0200 | ||
145 | @@ -21,6 +21,8 @@ | ||
146 | #ifndef BOOST_REGEX_SPLIT_HPP | ||
147 | #define BOOST_REGEX_SPLIT_HPP | ||
148 | |||
149 | +#include <climits> | ||
150 | + | ||
151 | namespace boost{ | ||
152 | |||
153 | #ifdef BOOST_HAS_ABI_HEADERS | ||
154 | Index: boost_1_34_1/boost/regex/v4/states.hpp | ||
155 | =================================================================== | ||
156 | --- boost_1_34_1.orig/boost/regex/v4/states.hpp 2005-09-20 14:01:25.000000000 +0200 | ||
157 | +++ boost_1_34_1/boost/regex/v4/states.hpp 2008-09-20 20:55:21.000000000 +0200 | ||
158 | @@ -23,6 +23,8 @@ | ||
159 | # include BOOST_ABI_PREFIX | ||
160 | #endif | ||
161 | |||
162 | +#include <climits> | ||
163 | + | ||
164 | namespace boost{ | ||
165 | namespace re_detail{ | ||
166 | |||
167 | Index: boost_1_34_1/boost/serialization/collection_traits.hpp | ||
168 | =================================================================== | ||
169 | --- boost_1_34_1.orig/boost/serialization/collection_traits.hpp 2005-06-21 07:19:04.000000000 +0200 | ||
170 | +++ boost_1_34_1/boost/serialization/collection_traits.hpp 2008-09-20 20:55:21.000000000 +0200 | ||
171 | @@ -22,6 +22,7 @@ | ||
172 | // compiles recognize the same set of primitive types, the possibility | ||
173 | // exists for archives to be non-portable if class information for primitive | ||
174 | // types is included. This is addressed by the following macros. | ||
175 | +#include <climits> | ||
176 | #include <boost/config.hpp> | ||
177 | #include <boost/mpl/integral_c.hpp> | ||
178 | #include <boost/mpl/integral_c_tag.hpp> | ||
179 | Index: boost_1_34_1/boost/spirit/phoenix/operators.hpp | ||
180 | =================================================================== | ||
181 | --- boost_1_34_1.orig/boost/spirit/phoenix/operators.hpp 2006-08-25 18:27:30.000000000 +0200 | ||
182 | +++ boost_1_34_1/boost/spirit/phoenix/operators.hpp 2008-09-20 20:55:21.000000000 +0200 | ||
183 | @@ -24,6 +24,7 @@ | ||
184 | #include <boost/spirit/phoenix/composite.hpp> | ||
185 | #include <boost/config.hpp> | ||
186 | #include <boost/mpl/if.hpp> | ||
187 | +#include <climits> | ||
188 | |||
189 | /////////////////////////////////////////////////////////////////////////////// | ||
190 | namespace phoenix { | ||
191 | Index: boost_1_34_1/boost/test/test_tools.hpp | ||
192 | =================================================================== | ||
193 | --- boost_1_34_1.orig/boost/test/test_tools.hpp 2007-02-22 18:57:29.000000000 +0100 | ||
194 | +++ boost_1_34_1/boost/test/test_tools.hpp 2008-09-20 20:55:21.000000000 +0200 | ||
195 | @@ -42,6 +42,7 @@ | ||
196 | #include <boost/mpl/or.hpp> | ||
197 | |||
198 | // STL | ||
199 | +#include <climits> | ||
200 | #include <cstddef> // for std::size_t | ||
201 | #include <iosfwd> | ||
202 | |||
203 | Index: boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp | ||
204 | =================================================================== | ||
205 | --- boost_1_34_1.orig/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2006-12-20 17:38:24.000000000 +0100 | ||
206 | +++ boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2008-09-20 20:55:21.000000000 +0200 | ||
207 | @@ -16,6 +16,7 @@ | ||
208 | #include <string> | ||
209 | #include <cstdio> | ||
210 | #include <cstdarg> | ||
211 | +#include <cstring> | ||
212 | #if defined(BOOST_SPIRIT_DEBUG) | ||
213 | #include <iostream> | ||
214 | #endif // defined(BOOST_SPIRIT_DEBUG) | ||
215 | Index: boost_1_34_1/boost/wave/util/flex_string.hpp | ||
216 | =================================================================== | ||
217 | --- boost_1_34_1.orig/boost/wave/util/flex_string.hpp 2006-04-25 19:21:01.000000000 +0200 | ||
218 | +++ boost_1_34_1/boost/wave/util/flex_string.hpp 2008-09-20 20:55:21.000000000 +0200 | ||
219 | @@ -94,6 +94,7 @@ | ||
220 | #include <limits> | ||
221 | #include <stdexcept> | ||
222 | #include <cstddef> | ||
223 | +#include <cstring> | ||
224 | |||
225 | // this must occur after all of the includes and before any code appears | ||
226 | #ifdef BOOST_HAS_ABI_HEADERS | ||
diff --git a/meta/recipes-support/boost/files/atomic_count_gcc_atomicity.patch b/meta/recipes-support/boost/files/atomic_count_gcc_atomicity.patch deleted file mode 100644 index 64d5884152..0000000000 --- a/meta/recipes-support/boost/files/atomic_count_gcc_atomicity.patch +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Index: boost_1_33_1/boost/detail/atomic_count_gcc.hpp | ||
4 | =================================================================== | ||
5 | --- boost_1_33_1.orig/boost/detail/atomic_count_gcc.hpp 2008-05-01 20:43:45.000000000 +0200 | ||
6 | +++ boost_1_33_1/boost/detail/atomic_count_gcc.hpp 2008-05-01 20:43:55.000000000 +0200 | ||
7 | @@ -17,7 +17,7 @@ | ||
8 | // http://www.boost.org/LICENSE_1_0.txt) | ||
9 | // | ||
10 | |||
11 | -#include <bits/atomicity.h> | ||
12 | +#include <ext/atomicity.h> | ||
13 | |||
14 | namespace boost | ||
15 | { | ||
diff --git a/meta/recipes-support/boost/files/gcc41.patch b/meta/recipes-support/boost/files/gcc41.patch deleted file mode 100644 index a1bd57e1f0..0000000000 --- a/meta/recipes-support/boost/files/gcc41.patch +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | diff -ur boost_1_33_1.orig/boost/bind.hpp boost_1_33_1/boost/bind.hpp | ||
4 | --- boost_1_33_1.orig/boost/bind.hpp 2008-10-11 10:30:03.000000000 +0200 | ||
5 | +++ boost_1_33_1/boost/bind.hpp 2008-10-11 10:41:25.000000000 +0200 | ||
6 | @@ -28,6 +28,10 @@ | ||
7 | #include <boost/bind/arg.hpp> | ||
8 | #include <boost/detail/workaround.hpp> | ||
9 | |||
10 | +#if __GNUC__ == 4 && __GNUC_MINOR__ == 1 | ||
11 | +# include <boost/visit_each.hpp> | ||
12 | +#endif | ||
13 | + | ||
14 | // Borland-specific bug, visit_each() silently fails to produce code | ||
15 | |||
16 | #if defined(__BORLANDC__) | ||
diff --git a/meta/recipes-support/boost/files/gcc43.patch b/meta/recipes-support/boost/files/gcc43.patch deleted file mode 100644 index dbf980d6f4..0000000000 --- a/meta/recipes-support/boost/files/gcc43.patch +++ /dev/null | |||
@@ -1,258 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | diff -aNru boost_1_34_1-ORIGINAL/boost/archive/polymorphic_iarchive.hpp boost_1_34_1/boost/archive/polymorphic_iarchive.hpp | ||
4 | --- boost_1_34_1-ORIGINAL/boost/archive/polymorphic_iarchive.hpp 2005-12-11 00:12:51.000000000 -0600 | ||
5 | +++ boost_1_34_1/boost/archive/polymorphic_iarchive.hpp 2008-03-03 03:08:59.000000000 -0600 | ||
6 | @@ -17,6 +17,7 @@ | ||
7 | // See http://www.boost.org for updates, documentation, and revision history. | ||
8 | |||
9 | #include <cstddef> // std::size_t | ||
10 | +#include <climits> | ||
11 | #include <boost/config.hpp> | ||
12 | |||
13 | #if defined(BOOST_NO_STDC_NAMESPACE) | ||
14 | diff -aNru boost_1_34_1-ORIGINAL/boost/archive/polymorphic_oarchive.hpp boost_1_34_1/boost/archive/polymorphic_oarchive.hpp | ||
15 | --- boost_1_34_1-ORIGINAL/boost/archive/polymorphic_oarchive.hpp 2006-02-11 23:43:06.000000000 -0600 | ||
16 | +++ boost_1_34_1/boost/archive/polymorphic_oarchive.hpp 2008-03-03 03:08:59.000000000 -0600 | ||
17 | @@ -17,6 +17,7 @@ | ||
18 | // See http://www.boost.org for updates, documentation, and revision history. | ||
19 | |||
20 | #include <cstddef> // size_t | ||
21 | +#include <climits> | ||
22 | #include <string> | ||
23 | |||
24 | #include <boost/config.hpp> | ||
25 | diff -aNru boost_1_34_1-ORIGINAL/boost/date_time/date_facet.hpp boost_1_34_1/boost/date_time/date_facet.hpp | ||
26 | --- boost_1_34_1-ORIGINAL/boost/date_time/date_facet.hpp 2005-09-05 16:10:50.000000000 -0500 | ||
27 | +++ boost_1_34_1/boost/date_time/date_facet.hpp 2008-03-03 03:08:59.000000000 -0600 | ||
28 | @@ -429,7 +429,7 @@ | ||
29 | typedef std::basic_string<CharT> string_type; | ||
30 | typedef CharT char_type; | ||
31 | typedef boost::date_time::period_parser<date_type, CharT> period_parser_type; | ||
32 | - typedef special_values_parser<date_type,CharT> special_values_parser_type; | ||
33 | + typedef boost::date_time::special_values_parser<date_type,CharT> special_values_parser_type; | ||
34 | typedef std::vector<std::basic_string<CharT> > input_collection_type; | ||
35 | typedef format_date_parser<date_type, CharT> format_date_parser_type; | ||
36 | // date_generators stuff goes here | ||
37 | diff -aNru boost_1_34_1-ORIGINAL/boost/mpl/zip_view.hpp boost_1_34_1/boost/mpl/zip_view.hpp | ||
38 | --- boost_1_34_1-ORIGINAL/boost/mpl/zip_view.hpp 2004-09-02 10:40:42.000000000 -0500 | ||
39 | +++ boost_1_34_1/boost/mpl/zip_view.hpp 2008-03-03 03:08:59.000000000 -0600 | ||
40 | @@ -37,7 +37,7 @@ | ||
41 | typedef zip_iterator< | ||
42 | typename transform1< | ||
43 | IteratorSeq | ||
44 | - , next<_1> | ||
45 | + , boost::mpl::next<_1> | ||
46 | >::type | ||
47 | > next; | ||
48 | }; | ||
49 | @@ -48,8 +48,8 @@ | ||
50 | struct zip_view | ||
51 | { | ||
52 | private: | ||
53 | - typedef typename transform1< Sequences, begin<_1> >::type first_ones_; | ||
54 | - typedef typename transform1< Sequences, end<_1> >::type last_ones_; | ||
55 | + typedef typename transform1< Sequences, boost::mpl::begin<_1> >::type first_ones_; | ||
56 | + typedef typename transform1< Sequences, boost::mpl::end<_1> >::type last_ones_; | ||
57 | |||
58 | public: | ||
59 | typedef nested_begin_end_tag tag; | ||
60 | diff -aNru boost_1_34_1-ORIGINAL/boost/python/detail/def_helper.hpp boost_1_34_1/boost/python/detail/def_helper.hpp | ||
61 | --- boost_1_34_1-ORIGINAL/boost/python/detail/def_helper.hpp 2004-09-15 20:00:28.000000000 -0500 | ||
62 | +++ boost_1_34_1/boost/python/detail/def_helper.hpp 2008-03-03 03:08:59.000000000 -0600 | ||
63 | @@ -155,7 +155,7 @@ | ||
64 | , T3 const& | ||
65 | , T4 const& | ||
66 | , default_call_policies | ||
67 | - , keywords<0> | ||
68 | + , boost::python::detail::keywords<0> | ||
69 | , char const* | ||
70 | , void(not_specified::*)() // A function pointer type which is never an | ||
71 | // appropriate default implementation | ||
72 | diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_creator.hpp boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp | ||
73 | --- boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_creator.hpp 2006-07-16 11:06:38.000000000 -0500 | ||
74 | +++ boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp 2008-03-03 03:08:59.000000000 -0600 | ||
75 | @@ -24,6 +24,8 @@ | ||
76 | # include BOOST_ABI_PREFIX | ||
77 | #endif | ||
78 | |||
79 | +#include <climits> | ||
80 | + | ||
81 | namespace boost{ | ||
82 | |||
83 | namespace re_detail{ | ||
84 | diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex.hpp boost_1_34_1/boost/regex/v4/basic_regex.hpp | ||
85 | --- boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex.hpp 2007-06-05 12:28:18.000000000 -0500 | ||
86 | +++ boost_1_34_1/boost/regex/v4/basic_regex.hpp 2008-03-03 03:08:59.000000000 -0600 | ||
87 | @@ -23,6 +23,8 @@ | ||
88 | # include BOOST_ABI_PREFIX | ||
89 | #endif | ||
90 | |||
91 | +#include <climits> | ||
92 | + | ||
93 | namespace boost{ | ||
94 | #ifdef BOOST_MSVC | ||
95 | #pragma warning(push) | ||
96 | diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_parser.hpp boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp | ||
97 | --- boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_parser.hpp 2006-12-20 11:19:05.000000000 -0600 | ||
98 | +++ boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp 2008-03-03 03:08:59.000000000 -0600 | ||
99 | @@ -23,6 +23,8 @@ | ||
100 | # include BOOST_ABI_PREFIX | ||
101 | #endif | ||
102 | |||
103 | +#include <climits> | ||
104 | + | ||
105 | namespace boost{ | ||
106 | namespace re_detail{ | ||
107 | |||
108 | diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/cpp_regex_traits.hpp boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp | ||
109 | --- boost_1_34_1-ORIGINAL/boost/regex/v4/cpp_regex_traits.hpp 2007-01-15 05:09:44.000000000 -0600 | ||
110 | +++ boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp 2008-03-03 03:08:59.000000000 -0600 | ||
111 | @@ -41,6 +41,7 @@ | ||
112 | |||
113 | #include <istream> | ||
114 | #include <ios> | ||
115 | +#include <climits> | ||
116 | |||
117 | #ifdef BOOST_HAS_ABI_HEADERS | ||
118 | # include BOOST_ABI_PREFIX | ||
119 | diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/perl_matcher.hpp boost_1_34_1/boost/regex/v4/perl_matcher.hpp | ||
120 | --- boost_1_34_1-ORIGINAL/boost/regex/v4/perl_matcher.hpp 2006-10-18 07:55:30.000000000 -0500 | ||
121 | +++ boost_1_34_1/boost/regex/v4/perl_matcher.hpp 2008-03-03 03:08:59.000000000 -0600 | ||
122 | @@ -18,6 +18,8 @@ | ||
123 | # include BOOST_ABI_PREFIX | ||
124 | #endif | ||
125 | |||
126 | +#include <climits> | ||
127 | + | ||
128 | namespace boost{ | ||
129 | namespace re_detail{ | ||
130 | |||
131 | diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/regex_split.hpp boost_1_34_1/boost/regex/v4/regex_split.hpp | ||
132 | --- boost_1_34_1-ORIGINAL/boost/regex/v4/regex_split.hpp 2005-01-21 11:22:38.000000000 -0600 | ||
133 | +++ boost_1_34_1/boost/regex/v4/regex_split.hpp 2008-03-03 03:08:59.000000000 -0600 | ||
134 | @@ -21,6 +21,8 @@ | ||
135 | #ifndef BOOST_REGEX_SPLIT_HPP | ||
136 | #define BOOST_REGEX_SPLIT_HPP | ||
137 | |||
138 | +#include <climits> | ||
139 | + | ||
140 | namespace boost{ | ||
141 | |||
142 | #ifdef BOOST_HAS_ABI_HEADERS | ||
143 | diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/states.hpp boost_1_34_1/boost/regex/v4/states.hpp | ||
144 | --- boost_1_34_1-ORIGINAL/boost/regex/v4/states.hpp 2005-09-20 07:01:25.000000000 -0500 | ||
145 | +++ boost_1_34_1/boost/regex/v4/states.hpp 2008-03-03 03:08:59.000000000 -0600 | ||
146 | @@ -23,6 +23,8 @@ | ||
147 | # include BOOST_ABI_PREFIX | ||
148 | #endif | ||
149 | |||
150 | +#include <climits> | ||
151 | + | ||
152 | namespace boost{ | ||
153 | namespace re_detail{ | ||
154 | |||
155 | diff -aNru boost_1_34_1-ORIGINAL/boost/serialization/collection_traits.hpp boost_1_34_1/boost/serialization/collection_traits.hpp | ||
156 | --- boost_1_34_1-ORIGINAL/boost/serialization/collection_traits.hpp 2005-06-21 00:19:04.000000000 -0500 | ||
157 | +++ boost_1_34_1/boost/serialization/collection_traits.hpp 2008-03-03 03:09:49.000000000 -0600 | ||
158 | @@ -22,6 +22,7 @@ | ||
159 | // compiles recognize the same set of primitive types, the possibility | ||
160 | // exists for archives to be non-portable if class information for primitive | ||
161 | // types is included. This is addressed by the following macros. | ||
162 | +#include <climits> | ||
163 | #include <boost/config.hpp> | ||
164 | #include <boost/mpl/integral_c.hpp> | ||
165 | #include <boost/mpl/integral_c_tag.hpp> | ||
166 | diff -aNru boost_1_34_1-ORIGINAL/boost/spirit/phoenix/operators.hpp boost_1_34_1/boost/spirit/phoenix/operators.hpp | ||
167 | --- boost_1_34_1-ORIGINAL/boost/spirit/phoenix/operators.hpp 2006-08-25 11:27:30.000000000 -0500 | ||
168 | +++ boost_1_34_1/boost/spirit/phoenix/operators.hpp 2008-03-03 03:08:59.000000000 -0600 | ||
169 | @@ -24,6 +24,7 @@ | ||
170 | #include <boost/spirit/phoenix/composite.hpp> | ||
171 | #include <boost/config.hpp> | ||
172 | #include <boost/mpl/if.hpp> | ||
173 | +#include <climits> | ||
174 | |||
175 | /////////////////////////////////////////////////////////////////////////////// | ||
176 | namespace phoenix { | ||
177 | diff -aNru boost_1_34_1-ORIGINAL/boost/test/test_tools.hpp boost_1_34_1/boost/test/test_tools.hpp | ||
178 | --- boost_1_34_1-ORIGINAL/boost/test/test_tools.hpp 2007-02-22 11:57:29.000000000 -0600 | ||
179 | +++ boost_1_34_1/boost/test/test_tools.hpp 2008-03-03 03:08:59.000000000 -0600 | ||
180 | @@ -42,6 +42,7 @@ | ||
181 | #include <boost/mpl/or.hpp> | ||
182 | |||
183 | // STL | ||
184 | +#include <climits> | ||
185 | #include <cstddef> // for std::size_t | ||
186 | #include <iosfwd> | ||
187 | |||
188 | diff -aNru boost_1_34_1-ORIGINAL/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp | ||
189 | --- boost_1_34_1-ORIGINAL/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2006-12-20 10:38:24.000000000 -0600 | ||
190 | +++ boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2008-03-03 03:08:59.000000000 -0600 | ||
191 | @@ -16,6 +16,7 @@ | ||
192 | #include <string> | ||
193 | #include <cstdio> | ||
194 | #include <cstdarg> | ||
195 | +#include <cstring> | ||
196 | #if defined(BOOST_SPIRIT_DEBUG) | ||
197 | #include <iostream> | ||
198 | #endif // defined(BOOST_SPIRIT_DEBUG) | ||
199 | diff -aNru boost_1_34_1-ORIGINAL/boost/wave/util/flex_string.hpp boost_1_34_1/boost/wave/util/flex_string.hpp | ||
200 | --- boost_1_34_1-ORIGINAL/boost/wave/util/flex_string.hpp 2006-04-25 12:21:01.000000000 -0500 | ||
201 | +++ boost_1_34_1/boost/wave/util/flex_string.hpp 2008-03-03 03:08:59.000000000 -0600 | ||
202 | @@ -94,6 +94,7 @@ | ||
203 | #include <limits> | ||
204 | #include <stdexcept> | ||
205 | #include <cstddef> | ||
206 | +#include <cstring> | ||
207 | |||
208 | // this must occur after all of the includes and before any code appears | ||
209 | #ifdef BOOST_HAS_ABI_HEADERS | ||
210 | |||
211 | --- boost_1_33_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2008-07-05 01:50:04.000000000 +0200 | ||
212 | +++ boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2006-12-20 17:38:24.000000000 +0100 | ||
213 | @@ -295,17 +325,20 @@ | ||
214 | |||
215 | lex_functor(IteratorT const &first, IteratorT const &last, | ||
216 | PositionT const &pos, boost::wave::language_support language) | ||
217 | - : lexer(first, last, pos, language) | ||
218 | + : re2c_lexer(first, last, pos, language) | ||
219 | {} | ||
220 | virtual ~lex_functor() {} | ||
221 | |||
222 | // get the next token from the input stream | ||
223 | - token_type get() { return lexer.get(); } | ||
224 | - void set_position(PositionT const &pos) | ||
225 | - { lexer.set_position(pos); } | ||
226 | + token_type get() { return re2c_lexer.get(); } | ||
227 | + void set_position(PositionT const &pos) { re2c_lexer.set_position(pos); } | ||
228 | +#if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0 | ||
229 | + bool has_include_guards(std::string& guard_name) const | ||
230 | + { return re2c_lexer.has_include_guards(guard_name); } | ||
231 | +#endif | ||
232 | |||
233 | private: | ||
234 | - lexer<IteratorT, PositionT> lexer; | ||
235 | + lexer<IteratorT, PositionT> re2c_lexer; | ||
236 | }; | ||
237 | |||
238 | /////////////////////////////////////////////////////////////////////////////// | ||
239 | @@ -338,7 +371,7 @@ | ||
240 | // It is coupled to the iterator type to allow to decouple the lexer/iterator | ||
241 | // configurations at compile time. | ||
242 | // | ||
243 | -// This function is declared inside the cpp_slex_token.hpp file, which is | ||
244 | +// This function is declared inside the cpp_lex_token.hpp file, which is | ||
245 | // referenced by the source file calling the lexer and the source file, which | ||
246 | // instantiates the lex_functor. But is is defined here, so it will be | ||
247 | // instantiated only while compiling the source file, which instantiates the | ||
248 | @@ -356,8 +389,8 @@ | ||
249 | IteratorT const &last, PositionT const &pos, | ||
250 | boost::wave::language_support language) | ||
251 | { | ||
252 | - return new re2clex::lex_functor<IteratorT, PositionT>(first, last, pos, | ||
253 | - language); | ||
254 | + using re2clex::lex_functor; | ||
255 | + return new lex_functor<IteratorT, PositionT>(first, last, pos, language); | ||
256 | } | ||
257 | |||
258 | #undef BOOST_WAVE_RE2C_NEW_LEXER_INLINE | ||
diff --git a/meta/recipes-support/boost/files/linux-uclibc.patch b/meta/recipes-support/boost/files/linux-uclibc.patch deleted file mode 100644 index 470e0844fb..0000000000 --- a/meta/recipes-support/boost/files/linux-uclibc.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | --- /dev/null 1969-12-31 16:00:00.000000000 -0800 | ||
4 | +++ boost_1_32_0/boost/config/platform/linux-uclibc.hpp 2005-07-05 14:51:56.237294460 -0700 | ||
5 | @@ -0,0 +1,7 @@ | ||
6 | +// Modifications required to support uClibC libc implementation. | ||
7 | +// Default to Linux... | ||
8 | +#include "linux.hpp" | ||
9 | + | ||
10 | +// Override anything uClibC doesn't support. | ||
11 | +// At present (0.9.27) the nl_types.h header exists but is not implemented | ||
12 | +#undef BOOST_HAS_NL_TYPES_H | ||
diff --git a/meta/recipes-support/boost/files/unit_test_log10f.patch b/meta/recipes-support/boost/files/unit_test_log10f.patch deleted file mode 100644 index 8eec589914..0000000000 --- a/meta/recipes-support/boost/files/unit_test_log10f.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | --- boost_1_32_0/libs/test/src/unit_test_result.cpp.orig 2005-07-05 11:00:53.887594850 -0700 | ||
4 | +++ boost_1_32_0/libs/test/src/unit_test_result.cpp 2005-07-05 11:01:20.683533034 -0700 | ||
5 | @@ -144,7 +144,7 @@ | ||
6 | unit_test_counter num_passed, unit_test_counter num_failed ) | ||
7 | { | ||
8 | unit_test_counter total_test_cases = num_passed + num_failed; | ||
9 | - std::size_t width = static_cast<std::size_t>( std::log10( (float)(std::max)( num_passed, num_failed ) ) ) + 1; | ||
10 | + std::size_t width = static_cast<std::size_t>( std::log10( (double)(std::max)( num_passed, num_failed ) ) ) + 1; | ||
11 | |||
12 | where_to << std::setw( indent ) << "" << std::setw( width ) << num_passed | ||
13 | << " test " << ps_name( num_passed != 1, "case" ) << " out of " << total_test_cases << " passed\n" | ||
14 | @@ -158,7 +158,7 @@ | ||
15 | { | ||
16 | unit_test_counter total_assertions = num_passed + num_failed; | ||
17 | std::size_t width = total_assertions > 0 | ||
18 | - ? static_cast<std::size_t>( std::log10( (float)(std::max)( num_passed, num_failed ) ) ) + 1 | ||
19 | + ? static_cast<std::size_t>( std::log10( (double)(std::max)( num_passed, num_failed ) ) ) + 1 | ||
20 | : 1; | ||
21 | |||
22 | where_to << std::setw( indent ) << "" << std::setw( width ) << num_passed | ||