commit e494b5cb90068bb31c01e68798f0a00b0177f166
Author: Elan Ruusamäe <[email protected]>
Date: Tue Nov 18 21:29:48 2014 +0200
system fastlz, libafdt
hhvm.spec | 8 +++++++-
system-thirdparty.patch | 18 +++++++++++++-----
2 files changed, 20 insertions(+), 6 deletions(-)
---
diff --git a/hhvm.spec b/hhvm.spec
index f5ce698..657e229 100644
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -3,6 +3,8 @@
%bcond_without system_dconv # system double-conversion
%bcond_without system_sqlite # system sqlite3
%bcond_without system_lz4 # system lz4
+%bcond_without system_fastlz # system fastlz
+%bcond_without system_libafdt # system libafdt
# NOTES:
# - hphp/runtime/base/runtime-option.cpp evalJitDefault enables jit if
/.hhvm-jit exists (yes, in filesystem root)
@@ -17,7 +19,7 @@
Summary: Virtual Machine, Runtime, and JIT for PHP
Name: hhvm
Version: 3.3.1
-Release: 0.4
+Release: 0.5
License: PHP 3.01 and BSD
Group: Development/Languages
Source0: https://github.com/facebook/hhvm/archive/HHVM-%{version}.tar.gz
@@ -48,11 +50,13 @@ BuildRequires: curl-devel >= 7.29.0
%{?with_system_dconv:BuildRequires: double-conversion-devel >= 1.1.1}
BuildRequires: elfutils-devel
BuildRequires: expat-devel
+%{?with_system_fastlz:BuildRequires: fastlz-devel >= 0.1.0-0.r12}
BuildRequires: gcc >= 6:4.6.0
BuildRequires: gd-devel
BuildRequires: glog-devel >= 0.3.2
BuildRequires: imap-devel >= 1:2007
#BuildRequires: jemalloc-devel >= 3.0.0
+%{?with_system_libafdt:BuildRequires: libafdt-devel >= 0.1.0}
BuildRequires: libcap-devel
BuildRequires: libdwarf-devel >= 20130729
BuildRequires: libicu-devel >= 4.2
@@ -283,6 +287,8 @@ fi
%{?with_system_sqlite:-DSYSTEM_SQLITE3=ON} \
%{?with_system_lz4:-DSYSTEM_LZ4=ON} \
%{?with_system_dconv:-DSYSTEM_DOUBLE_CONVERSION=ON} \
+ %{?with_system_fastlz:-DSYSTEM_FASTLZ=ON} \
+ %{?with_system_libafdt:-DSYSTEM_LIBAFDT=ON} \
-DENABLE_COTIRE=ON \
.
diff --git a/system-thirdparty.patch b/system-thirdparty.patch
index 1210525..41fe3ba 100644
--- a/system-thirdparty.patch
+++ b/system-thirdparty.patch
@@ -1,12 +1,12 @@
---- hhvm-HHVM-3.3.1/./third-party/CMakeLists.txt~ 2014-09-19
00:27:19.000000000 +0300
-+++ hhvm-HHVM-3.3.1/./third-party/CMakeLists.txt 2014-11-17
22:39:00.515744741 +0200
-@@ -24,16 +24,33 @@
+--- hhvm-HHVM-3.3.1/third-party/CMakeLists.txt 2014-11-17 22:39:00.515744741
+0200
++++ hhvm-HHVM-3.3.1/third-party/CMakeLists.txt 2014-11-18 19:55:23.702812657
+0200
+@@ -24,16 +24,39 @@
set(THIRD_PARTY_HEADERS)
list(APPEND THIRD_PARTY_MODULES
- pcre
- fastlz
- libafdt
+- fastlz
+- libafdt
libmbfl
- libsqlite3
timelib
@@ -24,6 +24,14 @@
+ list(APPEND THIRD_PARTY_MODULES libsqlite3)
+endif()
+
++if(NOT SYSTEM_FASTLZ)
++ list(APPEND THIRD_PARTY_MODULES fastlz)
++endif()
++
++if(NOT SYSTEM_LIBAFDT)
++ list(APPEND THIRD_PARTY_MODULES libafdt)
++endif()
++
+if(NOT SYSTEM_LZ4)
+ list(APPEND THIRD_PARTY_MODULES lz4)
+endif()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/e494b5cb90068bb31c01e68798f0a00b0177f166
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
