[packages/hhvm] - fix building with gcc 5.x

[baggins]

commit b343400f8d15cee0d062d6acb5d4a2aba7c6104d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Nov 21 23:53:10 2015 +0100

    - fix building with gcc 5.x

 gcc5.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 hhvm.spec  |  2 ++
 2 files changed, 48 insertions(+)
---
diff --git a/hhvm.spec b/hhvm.spec
index 4279716..13e2e25 100644
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -53,6 +53,7 @@ Patch3:		MAX.patch
 Patch4:		system-thirdparty.patch
 Patch5:		cmake.patch
 Patch6:		libvpx2.patch
+Patch7:		gcc5.patch
 URL:		https://github.com/facebook/hhvm/wiki
 BuildRequires:	ImageMagick-devel
 BuildRequires:	a52dec-libs-devel
@@ -260,6 +261,7 @@ mv folly-* third-party/folly/src
 %patch4 -p1
 #%patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # prefer ones from system
 rm CMake/FindBISON.cmake
diff --git a/gcc5.patch b/gcc5.patch
new file mode 100644
index 0000000..92b1f57
--- /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 at 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/third-party/folly/folly/Traits.h b/third-party/folly/folly/Traits.h
+index 309157c..a279c02 100644
+--- a/third-party/folly/folly/Traits.h
++++ b/third-party/folly/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>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/b343400f8d15cee0d062d6acb5d4a2aba7c6104d