[arch-commits] Commit in hhvm/trunk (PKGBUILD libstdcxx-dual-abi.patch)

[Evangelos Foutras]

    Date: Wednesday, June 24, 2015 @ 06:52:33
  Author: foutrelis
Revision: 135805

Fix build against new C++11 ABI

Added:
  hhvm/trunk/libstdcxx-dual-abi.patch
Modified:
  hhvm/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |    3 ++
 libstdcxx-dual-abi.patch |   46 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-24 04:26:17 UTC (rev 135804)
+++ PKGBUILD	2015-06-24 04:52:33 UTC (rev 135805)
@@ -38,6 +38,7 @@
         'php.ini'
         'server.ini'
         'gcc51.patch'
+        'libstdcxx-dual-abi.patch'
         'libvpx14.patch::https://patch-diff.githubusercontent.com/raw/facebook/hhvm/pull/5191.diff')
 install=hhvm.install
 backup=(etc/hhvm/{php,server}.ini)
@@ -62,6 +63,7 @@
     cd third-party/folly
     rm -rf src
     ln -s "$srcdir"/folly-$_folly_commit src
+    patch -d src -p1 -i "$srcdir"/libstdcxx-dual-abi.patch
 
     cd ../thrift
     rm -rf src
@@ -145,4 +147,5 @@
             '3e3093f817706c238fad021483f114fd4ce0b45d84097dcb7870157fc9ec769f'
             '5b53bc57965e1c5151d720dc7f63f1b2e8ebd5e758b2ef0be3b74df38ebcbce0'
             '3a7d1cfa7fb87365bbfc65975b8a96627c34d5389eb0de9c360f195cb717dfd0'
+            '8fe2192e3e10d46a77bbe4fda7ed588eecda22fd83d5952c79985f642bf00d68'
             '975885203cef50997a227f5355d49cb9135f0668981059df213f7f0b44597cf8')

Added: libstdcxx-dual-abi.patch
===================================================================
--- libstdcxx-dual-abi.patch	                        (rev 0)
+++ libstdcxx-dual-abi.patch	2015-06-24 04:52:33 UTC (rev 135805)
@@ -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/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>