up to 3.3.5

diff --git a/hhvm.spec b/hhvm.spec
index f10d10e505900cb88eb68097945ac95d31559e26..4c63a97c10d22a3c5b0f62249b58512004d4fa0a 100644 (file)
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -22,8 +22,8 @@
 # hphp/system/idl/constants.idl.json defines it as 5.6.99-hhvm, but use some saner value
 %define                php_version                     5.6.0
 
-# git show HHVM-3.3.3
-%define                githash 54b5f51c3670fe55852b6dab17a47c67b2271116
+# git show HHVM-3.3.5
+%define                githash b2856c601e317b6d66fd1861c4cc889ae91d9f6f
 # these hashes are git submodules (be sure to check them on proper branch)
 # GIT_DIR=third-party/.git git log -1
 %define                thirdparty      bf581f8
@@ -34,12 +34,12 @@ Summary:    Virtual Machine, Runtime, and JIT for PHP
 Name:          hhvm
 # we prefer LTS versions
 # see http://hhvm.com/blog/6083/hhvm-long-term-support
-Version:       3.3.3
-Release:       2
+Version:       3.3.5
+Release:       1
 License:       PHP 3.01 and BSD
 Group:         Development/Languages
 Source0:       https://github.com/facebook/hhvm/archive/HHVM-%{version}.tar.gz
-# Source0-md5: 89c620e2df253530a4f6f1a185ec913a
+# Source0-md5: 57af76be5b4a10e35cb6eb705e0ff663
 Source2:       https://github.com/facebook/folly/archive/%{folly}/folly-3.2-%{folly}.tar.gz
 # Source2-md5: c4bdbea4c0ffe0650d12d9ff370b8255
 Source3:       https://github.com/hhvm/hhvm-third-party/archive/%{thirdparty}/third_party-%{thirdparty}.tar.gz
@@ -53,7 +53,6 @@ Patch2:               hphpize.patch
 Patch3:                MAX.patch
 Patch4:                system-thirdparty.patch
 Patch5:                cmake.patch
-Patch6:                system-fastlz.patch
 URL:           https://github.com/facebook/hhvm/wiki
 BuildRequires: ImageMagick-devel
 BuildRequires: a52dec-libs-devel
@@ -260,7 +259,6 @@ mv folly-* third-party/folly/src
 %patch3 -p1
 %patch4 -p1
 #%patch5 -p1
-%patch6 -p1
 
 # prefer ones from system
 rm CMake/FindBISON.cmake

diff --git a/system-fastlz.patch b/system-fastlz.patch
deleted file mode 100644 (file)
index 187a57c..0000000
--- a/system-fastlz.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-based on https://github.com/facebook/hhvm/pull/4551
-adjusted for 3.3 branch
-
-From 0ad99e6892cf7ef7068910089aec09d5670509e7 Mon Sep 17 00:00:00 2001
-From: Johnny Robeson <johnny@localmomentum.net>
-Date: Wed, 31 Dec 2014 05:04:45 -0500
-Subject: [PATCH] refactor FastLZ cmake finder
-
-Changes of note:
-
- * actually find the library in cmake (instead of specifying manually)
- * rename from libfastlz to fastlz to match the library name
- * don't add the third-party includes if we already specified the includes dir
----
- CMake/FindFastLZ.cmake    | 19 +++++++++++++++++++
- CMake/HPHPFindLibs.cmake  |  6 ++++++
- CMake/HPHPSetup.cmake     |  5 ++++-
- 4 files changed, 29 insertions(+), 15 deletions(-)
- create mode 100644 CMake/FindFastLZ.cmake
- delete mode 100644 CMake/FindLibFastLz.cmake
-
-diff --git a/CMake/FindFastLZ.cmake b/CMake/FindFastLZ.cmake
-new file mode 100644
-index 0000000..43a2fb0
---- /dev/null
-+++ b/CMake/FindFastLZ.cmake
-@@ -0,0 +1,19 @@
-+if (FASTLZ_LIBRARY AND FASTLZ_INCLUDE_DIR)
-+  set (FASTLZ_FIND_QUIETLY TRUE)
-+endif (FASTLZ_LIBRARY AND FASTLZ_INCLUDE_DIR)
-+
-+find_path(FASTLZ_INCLUDE_DIR NAMES fastlz.h)
-+find_library(FASTLZ_LIBRARY NAMES fastlz)
-+
-+include (FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(FastLZ DEFAULT_MSG
-+  FASTLZ_LIBRARY
-+  FASTLZ_INCLUDE_DIR)
-+
-+if (NOT FASTLZ_FOUND)
-+  message(STATUS "Using third-party bundled fastlz")
-+else()
-+  message(STATUS "Found fastlz: ${FASTLZ_LIBRARY}")
-+endif (NOT FASTLZ_FOUND)
-+
-+mark_as_advanced(FASTLZ_INCLUDE_DIR FASTLZ_LIBRARY)
-diff --git a/CMake/HPHPFindLibs.cmake b/CMake/HPHPFindLibs.cmake
-index eb37774..d05efe2 100644
---- a/CMake/HPHPFindLibs.cmake
-+++ b/CMake/HPHPFindLibs.cmake
-@@ -152,6 +152,12 @@ if (LZ4_INCLUDE_DIR)
-   include_directories(${LZ4_INCLUDE_DIR})
- endif()
- 
-+# fastlz
-+find_package(FastLZ)
-+if (FASTLZ_INCLUDE_DIR)
-+  include_directories(${FASTLZ_INCLUDE_DIR})
-+endif()
-+
- # libzip
- find_package(LibZip)
- if (LIBZIP_INCLUDE_DIR_ZIP AND LIBZIP_INCLUDE_DIR_ZIPCONF)
-diff --git a/CMake/HPHPSetup.cmake b/CMake/HPHPSetup.cmake
-index ae7d4ce..5e49429 100644
---- a/CMake/HPHPSetup.cmake
-+++ b/CMake/HPHPSetup.cmake
-@@ -226,7 +226,10 @@ if (NOT PCRE_LIBRARY)
-   include_directories("${TP_DIR}/pcre")
- endif()
- 
--include_directories("${TP_DIR}/fastlz")
-+if (NOT FASTLZ_LIBRARY)
-+  include_directories("${TP_DIR}/fastlz")
-+endif()
-+
- include_directories("${TP_DIR}/timelib")
- include_directories("${TP_DIR}/libafdt/src")
- include_directories("${TP_DIR}/libmbfl")