From 32f4a5ba37757ace6711a82cae8dc2004963bd71 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Wed, 26 Apr 2017 19:48:32 +0200 Subject: [PATCH] - enable hashing for new c++11 char types - rel 4 --- boost.spec | 4 +++- hash-new-char-types.patch | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 hash-new-char-types.patch diff --git a/boost.spec b/boost.spec index 71367ed..126a4a1 100644 --- a/boost.spec +++ b/boost.spec @@ -13,7 +13,7 @@ Summary: The Boost C++ Libraries Summary(pl.UTF-8): Biblioteki C++ "Boost" Name: boost Version: 1.63.0 -Release: 3 +Release: 4 License: Boost Software License and others Group: Libraries Source0: http://downloads.sourceforge.net/boost/%{name}_%{fver}.tar.bz2 @@ -22,6 +22,7 @@ Patch0: %{name}-link.patch Patch1: %{name}-x32-context.patch Patch2: %{name}-clean-gcc-flags.patch Patch3: %{name}-numpy3.patch +Patch4: hash-new-char-types.patch # FC Patches: Patch201: %{name}-python-abi_letters.patch # https://github.com/boostorg/build/issues/163 @@ -486,6 +487,7 @@ Dokumentacja dla biblioteki Boost C++. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %patch201 -p1 %patch202 -p1 diff --git a/hash-new-char-types.patch b/hash-new-char-types.patch new file mode 100644 index 0000000..b767f52 --- /dev/null +++ b/hash-new-char-types.patch @@ -0,0 +1,21 @@ +https://svn.boost.org/trac/boost/ticket/11145 + +--- boost_1_63_0/boost/functional/hash/hash.hpp~ 2016-12-22 13:33:15.000000000 +0100 ++++ boost_1_63_0/boost/functional/hash/hash.hpp 2017-04-26 19:14:04.588719738 +0200 +@@ -117,6 +117,16 @@ + boost::hash_detail::enable_hash_value {}; + #endif + ++#if !defined(BOOST_NO_CXX11_CHAR16_T) ++ template <> struct basic_numbers : ++ boost::hash_detail::enable_hash_value {}; ++#endif ++ ++#if !defined(BOOST_NO_CXX11_CHAR32_T) ++ template <> struct basic_numbers : ++ boost::hash_detail::enable_hash_value {}; ++#endif ++ + template <> struct float_numbers : + boost::hash_detail::enable_hash_value {}; + template <> struct float_numbers : -- 2.44.0