summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/boost
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-01-19 14:40:06 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-21 10:22:09 +0000
commit21d04932de99056fbbff69c510c5599c2c851837 (patch)
tree81203d9de346fe67575dd79c2a0ab2c3fcdc9aa5 /meta/recipes-support/boost
parent3d3555839dac4fcd44313fd9fb4e47a421b09278 (diff)
downloadpoky-21d04932de99056fbbff69c510c5599c2c851837.tar.gz
boost: Upgrade 1.51 -> 1.52
Drop hash_enums.patch which is already applied upstream (From OE-Core rev: c4d3f5596662d6aced46f270f566b510a36e4952) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/boost')
-rw-r--r--meta/recipes-support/boost/boost.inc2
-rw-r--r--meta/recipes-support/boost/boost_1.51.0.bb11
-rw-r--r--meta/recipes-support/boost/boost_1.52.0.bb9
-rw-r--r--meta/recipes-support/boost/files/hash_enums.patch45
4 files changed, 9 insertions, 58 deletions
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index 4fe5a354de..1266666e30 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -16,8 +16,6 @@ BOOST_VER = "${@"_".join(d.getVar("PV",1).split("."))}"
16BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}" 16BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}"
17BOOST_P = "boost_${BOOST_VER}" 17BOOST_P = "boost_${BOOST_VER}"
18 18
19INC_PR = "r5"
20
21SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BOOST_P}.tar.bz2" 19SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BOOST_P}.tar.bz2"
22 20
23S = "${WORKDIR}/${BOOST_P}" 21S = "${WORKDIR}/${BOOST_P}"
diff --git a/meta/recipes-support/boost/boost_1.51.0.bb b/meta/recipes-support/boost/boost_1.51.0.bb
deleted file mode 100644
index b95049f277..0000000000
--- a/meta/recipes-support/boost/boost_1.51.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1include boost.inc
2
3LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
4
5PR = "${INC_PR}.1"
6
7SRC_URI += "file://arm-intrinsics.patch \
8 file://hash_enums.patch \
9 "
10SRC_URI[md5sum] = "4b6bd483b692fd138aef84ed2c8eb679"
11SRC_URI[sha256sum] = "fb2d2335a29ee7fe040a197292bfce982af84a645c81688a915c84c925b69696"
diff --git a/meta/recipes-support/boost/boost_1.52.0.bb b/meta/recipes-support/boost/boost_1.52.0.bb
new file mode 100644
index 0000000000..6c9dd3fafd
--- /dev/null
+++ b/meta/recipes-support/boost/boost_1.52.0.bb
@@ -0,0 +1,9 @@
1include boost.inc
2
3LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
4
5SRC_URI += "file://arm-intrinsics.patch \
6 "
7SRC_URI[md5sum] = "3a855e0f919107e0ca4de4d84ad3f750"
8SRC_URI[sha256sum] = "222b6afd7723f396f5682c20130314a10196d3999feab5ba920d2a6bf53bac92"
9
diff --git a/meta/recipes-support/boost/files/hash_enums.patch b/meta/recipes-support/boost/files/hash_enums.patch
deleted file mode 100644
index 368da962c1..0000000000
--- a/meta/recipes-support/boost/files/hash_enums.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1Allow hashing of enums.
2Fixes errors like
3
4/opt/poky/1.3.0-1/sysroots/i586-poky-linux/usr/include/boost/functional/hash/extensions.hpp:257:34: error: no matching function for call to 'hash_value(const myspace::idx&)'
5
6Upstream-Status: Pending
7Singed-off-by: Khem Raj <raj.khem@gmail.com>
8
9Index: boost_1_51_0/boost/functional/hash/hash.hpp
10===================================================================
11--- boost_1_51_0.orig/boost/functional/hash/hash.hpp 2012-07-15 16:28:30.000000000 -0700
12+++ boost_1_51_0/boost/functional/hash/hash.hpp 2012-09-26 14:00:57.738364002 -0700
13@@ -15,6 +15,8 @@
14 #include <boost/functional/hash/detail/hash_float.hpp>
15 #include <string>
16 #include <boost/limits.hpp>
17+#include <boost/type_traits/is_enum.hpp>
18+#include <boost/utility/enable_if.hpp>
19
20 #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
21 #include <boost/type_traits/is_pointer.hpp>
22@@ -89,6 +91,9 @@
23 typename boost::hash_detail::long_numbers<T>::type hash_value(T);
24 template <typename T>
25 typename boost::hash_detail::ulong_numbers<T>::type hash_value(T);
26+ template <typename T>
27+ typename boost::enable_if<boost::is_enum<T>, std::size_t>::type
28+ hash_value(T);
29
30 #if !BOOST_WORKAROUND(__DMC__, <= 0x848)
31 template <class T> std::size_t hash_value(T* const&);
32@@ -178,7 +183,12 @@
33 {
34 return hash_detail::hash_value_unsigned(v);
35 }
36-
37+ template <typename T>
38+ typename boost::enable_if<boost::is_enum<T>, std::size_t>::type
39+ hash_value(T v)
40+ {
41+ return static_cast<std::size_t>(v);
42+ }
43 // Implementation by Alberto Barbati and Dave Harris.
44 #if !BOOST_WORKAROUND(__DMC__, <= 0x848)
45 template <class T> std::size_t hash_value(T* const& v)