commit 500006c70e97219cfed81596193895115ffd0c5c
Author: Elan Ruusamäe <[email protected]>
Date: Wed Feb 19 19:37:59 2014 +0200
up to 2.4.1; requires old libdwarf<=20120410 to build
checksum.patch | 24 ------------------------
hhvm.spec | 28 ++++++++++++++++------------
imap-gss.patch | 17 -----------------
3 files changed, 16 insertions(+), 53 deletions(-)
---
diff --git a/hhvm.spec b/hhvm.spec
index e88d7a5..7ce1406 100644
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -3,20 +3,22 @@
# TODO
# - system libevent2: https://github.com/facebook/hiphop-php/pull/421
# - system libmbfl, system xhp, sqlite3
+# - libdwarf>20120410 issue: https://github.com/facebook/hhvm/issues/1337
%define githash f951cb8d8812c59344d5322454853b584b668636
+%define folly 18bedc2
Summary: Virtual Machine, Runtime, and JIT for PHP
Name: hhvm
-Version: 2.3.2
-Release: 4
+Version: 2.4.1
+Release: 0.1
License: PHP 3.01
Group: Development/Languages
Source0: https://github.com/facebook/hhvm/archive/HHVM-%{version}.tar.gz
-# Source0-md5: 471961d38ba52c66b7038c556b2b7bd8
+# Source0-md5: a18dde8a30f8293963e6641ee8cb04c8
# need fb.changes.patch, which is available for 1.4 only
Source1: http://www.monkey.org/~provos/libevent-1.4.14b-stable.tar.gz
# Source1-md5: a00e037e4d3f9e4fe9893e8a2d27918c
-Source2:
https://github.com/facebook/folly/archive/311c98e/folly-0.1-311c98e.tar.gz
-# Source2-md5: 338c206bccfa1a19eeb45396cd6adac6
+Source2:
https://github.com/facebook/folly/archive/%{folly}/folly-0.1-%{folly}.tar.gz
+# Source2-md5: 5de02fa81641c66a93c2f57094c7aa72
Source3: %{name}-fcgi.init
Source4: %{name}-fcgi.sysconfig
Source100: get-source.sh
@@ -25,8 +27,6 @@ Patch1: libevent14.patch
Patch3: system-xhp.patch
Patch4: system-libafdt.patch
Patch5: system-folly.patch
-Patch6: checksum.patch
-Patch7: imap-gss.patch
Patch8: hphpize.patch
Patch9: notest.patch
Patch10: no-debug.patch
@@ -45,7 +45,7 @@ BuildRequires: glog-devel >= 0.3.2
BuildRequires: imap-devel >= 1:2007
#BuildRequires: jemalloc-devel >= 3.0.0
BuildRequires: libcap-devel
-BuildRequires: libdwarf-devel
+BuildRequires: libdwarf-devel <= 20120410
#BuildRequires: libevent-devel >= 1.4.14
BuildRequires: libicu-devel >= 4.2
#BuildRequires: libmbfl-devel
@@ -187,8 +187,6 @@ C++.
mv folly-*/* hphp/submodules/folly
-%patch6 -p1
-%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
@@ -366,10 +364,10 @@ fi
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/hphpize
%{_includedir}/hphp
-%{_datadir}/cmake/Modules/hphpize.cmake
+%{_datadir}/cmake/Modules/ExtZendCompat.cmake
%{_datadir}/cmake/Modules/FindCClient.cmake
%{_datadir}/cmake/Modules/FindEditline.cmake
-%{_datadir}/cmake/Modules/FindGD.cmake
+%{_datadir}/cmake/Modules/FindFreetype.cmake
%{_datadir}/cmake/Modules/FindGlog.cmake
%{_datadir}/cmake/Modules/FindICU.cmake
%{_datadir}/cmake/Modules/FindLdap.cmake
@@ -380,8 +378,13 @@ fi
%{_datadir}/cmake/Modules/FindLibElf.cmake
%{_datadir}/cmake/Modules/FindLibEvent.cmake
%{_datadir}/cmake/Modules/FindLibEvent.cmake.bak
+%{_datadir}/cmake/Modules/FindLibJpeg.cmake
%{_datadir}/cmake/Modules/FindLibNuma.cmake
+%{_datadir}/cmake/Modules/FindLibPng.cmake
+%{_datadir}/cmake/Modules/FindLibUODBC.cmake
+%{_datadir}/cmake/Modules/FindLibVpx.cmake
%{_datadir}/cmake/Modules/FindLibXed.cmake
+%{_datadir}/cmake/Modules/FindLibYaml.cmake
%{_datadir}/cmake/Modules/FindLibiconv.cmake
%{_datadir}/cmake/Modules/FindLibinotify.cmake
%{_datadir}/cmake/Modules/FindLibmemcached.cmake
@@ -400,3 +403,4 @@ fi
%{_datadir}/cmake/Modules/HPHPFunctions.cmake
%{_datadir}/cmake/Modules/HPHPSetup.cmake
%{_datadir}/cmake/Modules/Options.cmake
+%{_datadir}/cmake/Modules/hphpize.cmake
diff --git a/checksum.patch b/checksum.patch
deleted file mode 100644
index 8a41f8e..0000000
--- a/checksum.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-disable crc32c_hw because it's compile fails:
-
-HHVM-2.3.2/hphp/third_party/folly/folly/Checksum.cpp: In function ‘uint32_t
folly::detail::crc32c_hw(const uint8_t*, size_t, uint32_t)’:
-HHVM-2.3.2/hphp/third_party/folly/folly/Checksum.cpp:43:63: error:
‘__builtin_ia32_crc32qi’ was not declared in this scope
- sum = (uint32_t)__builtin_ia32_crc32qi(sum, data[offset]);
- ^
-HHVM-2.3.2/hphp/third_party/folly/folly/Checksum.cpp:51:43: error:
‘__builtin_ia32_crc32di’ was not declared in this scope
- sum = __builtin_ia32_crc32di(sum, *src);
- ^
-HHVM-2.3.2/hphp/third_party/folly/folly/Checksum.cpp:57:61: error:
‘__builtin_ia32_crc32qi’ was not declared in this scope
- sum = (uint32_t)__builtin_ia32_crc32qi(sum, data[offset]);
-
-
---- hhvm-HHVM-2.3.2/hphp/third_party/folly/folly/Checksum.cpp~ 2014-01-06
21:39:35.000000000 +0200
-+++ hhvm-HHVM-2.3.2/hphp/third_party/folly/folly/Checksum.cpp 2014-01-07
19:12:23.829367686 +0200
-@@ -25,7 +25,7 @@
- namespace detail {
-
- #if defined(__x86_64__) && defined(__GNUC__) && defined(__GNUC_MINOR__) && \
-- (((__GNUC__ * 100) + __GNUC_MINOR__) >= 408)
-+ (((__GNUC__ * 100) + __GNUC_MINOR__) >= 408) && 0
-
- // Fast SIMD implementation of CRC-32C for x86 with SSE 4.2
- uint32_t crc32c_hw(const uint8_t *data, size_t nbytes,
diff --git a/imap-gss.patch b/imap-gss.patch
deleted file mode 100644
index 0437d6c..0000000
--- a/imap-gss.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-always disable imap gss
-see: https://github.com/facebook/hhvm/pull/1181#issuecomment-27153815
---- hhvm-HHVM-2.3.2/CMake/HPHPFindLibs.cmake~ 2013-12-23 22:51:42.000000000
+0200
-+++ hhvm-HHVM-2.3.2/CMake/HPHPFindLibs.cmake 2014-01-02 00:52:37.828252903
+0200
-@@ -308,10 +308,10 @@
- find_package(Libpam)
- if (PAM_INCLUDE_PATH)
- include_directories(${PAM_INCLUDE_PATH})
--else()
-- add_definitions(-DSKIP_IMAP_GSS=1)
- endif()
-
-+add_definitions(-DSKIP_IMAP_GSS=1)
-+
- if (EXISTS "${CCLIENT_INCLUDE_PATH}/linkage.c")
- CONTAINS_STRING("${CCLIENT_INCLUDE_PATH}/linkage.c" ssl_onceonlyinit
CCLIENT_HAS_SSL)
- endif()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/500006c70e97219cfed81596193895115ffd0c5c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
