- fix building with ggc 5.x

diff --git a/folly.spec b/folly.spec
index 79fb5dbcf4f8d1b525067d36c70e4ac21e5c5986..a68d7d456ff867bd881a7f7aa8e7f70268590ac9 100644 (file)
--- a/folly.spec
+++ b/folly.spec
@@ -11,6 +11,7 @@ License:      Apache v2.0
 Group:         Libraries
 Source0:       https://github.com/facebook/folly/archive/v%{version}/%{name}-%{version}.tar.gz
 # Source0-md5: d7ff7682850ea0846881fb1fb42136e9
+Patch0:                gcc5.patch
 URL:           https://github.com/facebook/folly
 BuildRequires: autoconf
 BuildRequires: automake
@@ -74,6 +75,7 @@ Statyczna biblioteka %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
 
 #ln -s %{_usrsrc}/gtest folly/test/gtest-1.7.0
 

diff --git a/gcc5.patch b/gcc5.patch
new file mode 100644 (file)
index 0000000..827a155
--- /dev/null
+++ b/gcc5.patch
@@ -0,0 +1,46 @@
+From ca2e9c7f1b6bf92f1f67ae627692547710932577 Mon Sep 17 00:00:00 2001
+From: Dimitri John Ledkov <dimitri.j.ledkov@intel.com>
+Date: Wed, 27 May 2015 13:30:08 +0100
+Subject: [PATCH] Fix forward declaration of basic_string and list, for dual
+ abi libstdc++ with inline std::__cxx11 namespace.
+
+Closes facebook/folly#213
+Closes facebook/folly#208
+---
+ folly/Traits.h | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/folly/Traits.h b/folly/Traits.h
+index 309157c..a279c02 100644
+--- a/folly/Traits.h
++++ b/folly/Traits.h
+@@ -19,6 +19,9 @@
+ #ifndef FOLLY_BASE_TRAITS_H_
+ #define FOLLY_BASE_TRAITS_H_
+ 
++#include <list>
++#include <string>
++
+ #include <memory>
+ #include <limits>
+ #include <type_traits>
+@@ -239,19 +242,10 @@ FOLLY_NAMESPACE_STD_BEGIN
+ 
+ template <class T, class U>
+   struct pair;
+-#ifndef _GLIBCXX_USE_FB
+-template <class T, class R, class A>
+-  class basic_string;
+-#else
+-template <class T, class R, class A, class S>
+-  class basic_string;
+-#endif
+ template <class T, class A>
+   class vector;
+ template <class T, class A>
+   class deque;
+-template <class T, class A>
+-  class list;
+ template <class T, class C, class A>
+   class set;
+ template <class K, class V, class C, class A>