Patchwork [4/4] boost: Upgrade 1.51 -> 1.52

login
register
mail settings
Submitter Khem Raj
Date Jan. 19, 2013, 10:40 p.m.
Message ID <fd16b03bb5881c7011869be4207a5d4c8a1f7441.1358634922.git.raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/42925/
State New
Headers show

Comments

Khem Raj - Jan. 19, 2013, 10:40 p.m.
Drop hash_enums.patch which is already applied upstream

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-support/boost/boost.inc               |    2 -
 .../boost/{boost_1.51.0.bb => boost_1.52.0.bb}     |    8 ++--
 meta/recipes-support/boost/files/hash_enums.patch  |   45 --------------------
 3 files changed, 3 insertions(+), 52 deletions(-)
 rename meta/recipes-support/boost/{boost_1.51.0.bb => boost_1.52.0.bb} (44%)
 delete mode 100644 meta/recipes-support/boost/files/hash_enums.patch

Patch

diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index 4fe5a35..1266666 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("."))}"
 BOOST_MAJ = "${@"_".join(d.getVar("PV",1).split(".")[0:2])}"
 BOOST_P = "boost_${BOOST_VER}"
 
-INC_PR = "r5"
-
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BOOST_P}.tar.bz2"
 
 S = "${WORKDIR}/${BOOST_P}"
diff --git a/meta/recipes-support/boost/boost_1.51.0.bb b/meta/recipes-support/boost/boost_1.52.0.bb
similarity index 44%
rename from meta/recipes-support/boost/boost_1.51.0.bb
rename to meta/recipes-support/boost/boost_1.52.0.bb
index b95049f..6c9dd3f 100644
--- a/meta/recipes-support/boost/boost_1.51.0.bb
+++ b/meta/recipes-support/boost/boost_1.52.0.bb
@@ -2,10 +2,8 @@  include boost.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
 
-PR = "${INC_PR}.1"
-
 SRC_URI += "file://arm-intrinsics.patch \
-            file://hash_enums.patch \
            "
-SRC_URI[md5sum] = "4b6bd483b692fd138aef84ed2c8eb679"
-SRC_URI[sha256sum] = "fb2d2335a29ee7fe040a197292bfce982af84a645c81688a915c84c925b69696"
+SRC_URI[md5sum] = "3a855e0f919107e0ca4de4d84ad3f750"
+SRC_URI[sha256sum] = "222b6afd7723f396f5682c20130314a10196d3999feab5ba920d2a6bf53bac92"
+
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 368da96..0000000
--- a/meta/recipes-support/boost/files/hash_enums.patch
+++ /dev/null
@@ -1,45 +0,0 @@ 
-Allow hashing of enums.
-Fixes errors like 
-
-/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&)'
-
-Upstream-Status: Pending
-Singed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Index: boost_1_51_0/boost/functional/hash/hash.hpp
-===================================================================
---- boost_1_51_0.orig/boost/functional/hash/hash.hpp	2012-07-15 16:28:30.000000000 -0700
-+++ boost_1_51_0/boost/functional/hash/hash.hpp	2012-09-26 14:00:57.738364002 -0700
-@@ -15,6 +15,8 @@
- #include <boost/functional/hash/detail/hash_float.hpp>
- #include <string>
- #include <boost/limits.hpp>
-+#include <boost/type_traits/is_enum.hpp>
-+#include <boost/utility/enable_if.hpp>
- 
- #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
- #include <boost/type_traits/is_pointer.hpp>
-@@ -89,6 +91,9 @@
-     typename boost::hash_detail::long_numbers<T>::type hash_value(T);
-     template <typename T>
-     typename boost::hash_detail::ulong_numbers<T>::type hash_value(T);
-+    template <typename T>
-+    typename boost::enable_if<boost::is_enum<T>, std::size_t>::type
-+      hash_value(T);
- 
- #if !BOOST_WORKAROUND(__DMC__, <= 0x848)
-     template <class T> std::size_t hash_value(T* const&);
-@@ -178,7 +183,12 @@
-     {
-         return hash_detail::hash_value_unsigned(v);
-     }
--
-+    template <typename T>
-+    typename boost::enable_if<boost::is_enum<T>, std::size_t>::type
-+      hash_value(T v)
-+    {
-+      return static_cast<std::size_t>(v);
-+    }
-     // Implementation by Alberto Barbati and Dave Harris.
- #if !BOOST_WORKAROUND(__DMC__, <= 0x848)
-     template <class T> std::size_t hash_value(T* const& v)