[packages/hhvm/hhvm-3.2] - rel 3; build fixes

[arekm]

commit f52ded4d94e226ea8cf09c79275b6d6caf04ab75
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Oct 14 08:37:28 2014 +0200

    - rel 3; build fixes

 hhvm-build.patch | 25 +++++++++++++++++++++++++
 hhvm.spec        |  4 +++-
 2 files changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/hhvm.spec b/hhvm.spec
index 77bb917..57314da 100644
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -10,7 +10,7 @@
 Summary:	Virtual Machine, Runtime, and JIT for PHP
 Name:		hhvm
 Version:	3.2.0
-Release:	2
+Release:	3
 License:	PHP 3.01
 Group:		Development/Languages
 Source0:	https://github.com/facebook/hhvm/archive/HHVM-%{version}.tar.gz
@@ -26,6 +26,7 @@ Source100:	get-source.sh
 Patch0:		ccache.patch
 Patch1:		no-debug.patch
 Patch2:		hphpize.patch
+Patch3:		%{name}-build.patch
 URL:		https://github.com/facebook/hhvm/wiki
 BuildRequires:	ImageMagick-devel
 BuildRequires:	a52dec-libs-devel
@@ -222,6 +223,7 @@ mv folly-* third-party/folly/src
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # prefer ones from system
 rm CMake/FindBISON.cmake
diff --git a/hhvm-build.patch b/hhvm-build.patch
new file mode 100644
index 0000000..18786b4
--- /dev/null
+++ b/hhvm-build.patch
@@ -0,0 +1,25 @@
+--- hhvm-HHVM-3.2.0/hphp/util/embedded-vfs.cpp~	2014-10-13 22:44:04.000000000 +0200
++++ hhvm-HHVM-3.2.0/hphp/util/embedded-vfs.cpp	2014-10-13 22:48:32.091727651 +0200
+@@ -35,6 +35,8 @@
+ #endif
+ #include <sqlite3ext.h>
+ 
++SQLITE_EXTENSION_INIT3
++
+ namespace HPHP {
+ 
+ /*
+--- hhvm-HHVM-3.2.0/hphp/compiler/analysis/emitter.cpp.org	2014-10-14 07:26:28.359842680 +0200
++++ hhvm-HHVM-3.2.0/hphp/compiler/analysis/emitter.cpp	2014-10-14 07:27:57.752869165 +0200
+@@ -796,7 +796,11 @@
+   return out.str();
+ }
+ 
++#ifndef MAX
++#define MAX(a, b)      ((a)>(b)?(a):(b))
++#endif
++
+ void SymbolicStack::push(char sym) {
+   if (sym != StackSym::W && sym != StackSym::K && sym != StackSym::L &&
+       sym != StackSym::T && sym != StackSym::I && sym != StackSym::H) {
+     m_actualStack.push_back(m_symStack.size());
================================================================

---- gitweb:

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