- fix build with icu 59, missing include

[packages/hhvm.git] / hhvm.spec

diff --git a/hhvm.spec b/hhvm.spec
index 6b18af7113df9666c2d051d9533bd7785839957b..5126c9ff07ff246728953c3d4449798845b95da0 100644 (file)
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -34,7 +34,7 @@ Name:         hhvm
 # we prefer LTS versions
 # see http://hhvm.com/blog/6083/hhvm-long-term-support
 Version:       3.3.7
-Release:       7
+Release:       13
 License:       PHP 3.01 and BSD
 Group:         Development/Languages
 Source0:       https://github.com/facebook/hhvm/archive/HHVM-%{version}.tar.gz
@@ -55,6 +55,9 @@ Patch5:               cmake.patch
 Patch6:                libvpx2.patch
 Patch7:                gcc5.patch
 Patch8:                cxx.patch
+Patch9:                gcc6.patch
+Patch10:       libevent-2.1.patch
+Patch11:       icu59.patch
 URL:           https://github.com/facebook/hhvm/wiki
 BuildRequires: ImageMagick-devel
 BuildRequires: a52dec-libs-devel
@@ -104,6 +107,7 @@ BuildRequires:      zlib-devel
 #BuildRequires:        flex >= 2.5.35
 BuildRequires: libafdt-devel >= 0.1.0
 #BuildRequires:        re2c >= 0.13.0
+BuildConflicts:        ImageMagick6-devel
 Provides:      %{name}(api) = %{hhvm_api_version}
 Provides:      php(core) = %{php_version}
 # foreach (get_loaded_extensions() as $ext) printf("Provides:\tphp(%s)\n", strtolower($ext));
@@ -264,6 +268,9 @@ mv folly-* third-party/folly/src
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 # prefer ones from system
 rm CMake/FindBISON.cmake
@@ -290,6 +297,8 @@ if [ $API != %{hhvm_api_version} ]; then
        exit 1
 fi
 
+export CXXFLAGS="%{rpmcxxflags} -fpermissive -I/usr/include/lz4"
+
 # out of dir build broken (can't find it's tools, or headers)
 #install -d build
 #cd build