[packages/hiphop-php] fix for gcc 4.8 std::is_trivially_destructible vs std::has_trivial_destructor
glen
glen at pld-linux.org
Sun Oct 6 02:03:54 CEST 2013
commit 1c7ec8177faf90a03f1eb6711cb53159cc0d0dc1
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Oct 6 03:02:45 2013 +0300
fix for gcc 4.8 std::is_trivially_destructible vs std::has_trivial_destructor
gcc4.8.patch | 16 ++++++++++++++++
hiphop-php.spec | 2 ++
2 files changed, 18 insertions(+)
---
diff --git a/hiphop-php.spec b/hiphop-php.spec
index 8db32f3..15008e3 100644
--- a/hiphop-php.spec
+++ b/hiphop-php.spec
@@ -26,6 +26,7 @@ Patch3: system-xhp.patch
Patch4: system-libafdt.patch
Patch5: system-folly.patch
Patch6: boost-system-category.patch
+Patch7: gcc4.8.patch
URL: http://wiki.github.com/facebook/hiphop-php/
BuildRequires: binutils-devel
BuildRequires: bison >= 2.3
@@ -77,6 +78,7 @@ Apache and mod_php.
%setup -q -n %{name}-HPHP-%{version} -a1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
ln -s libevent-1.4.*-stable libevent
%{__patch} -d libevent -p1 < hphp/third_party/libevent-1.4.14.fb-changes.diff
diff --git a/gcc4.8.patch b/gcc4.8.patch
new file mode 100644
index 0000000..9801cfe
--- /dev/null
+++ b/gcc4.8.patch
@@ -0,0 +1,16 @@
+--- hiphop-php-HPHP-2.1.0/hphp/runtime/vm/jit/phys-reg.h~ 2013-07-12 21:00:55.000000000 +0300
++++ hiphop-php-HPHP-2.1.0/hphp/runtime/vm/jit/phys-reg.h 2013-10-06 02:59:16.294268856 +0300
+@@ -250,8 +250,13 @@
+ uint64_t m_bits;
+ };
+
++#if 1
++static_assert(std::is_trivially_destructible<RegSet>::value,
++ "RegSet must have a trivial destructor");
++#else
+ static_assert(std::has_trivial_destructor<RegSet>::value,
+ "RegSet must have a trivial destructor");
++#endif
+
+ //////////////////////////////////////////////////////////////////////
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hiphop-php.git/commitdiff/1c7ec8177faf90a03f1eb6711cb53159cc0d0dc1
More information about the pld-cvs-commit
mailing list