[packages/hhvm] - disable crc32c_hw because it's compile fails - always disable imap gss

[glen]

commit 457edd58e62f96ae05a387a8f85171b12aff2d66
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Jan 2 17:22:52 2014 +0000

    - disable crc32c_hw because it's compile fails
    - always disable imap gss

 checksum.patch | 24 ++++++++++++++++++++++++
 hhvm.spec      |  5 +++++
 imap-gss.patch | 17 +++++++++++++++++
 3 files changed, 46 insertions(+)
---
diff --git a/hhvm.spec b/hhvm.spec
index f15ddb2..17b4967 100644
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -22,6 +22,8 @@ Patch1:		libevent14.patch
 Patch3:		system-xhp.patch
 Patch4:		system-libafdt.patch
 Patch5:		system-folly.patch
+Patch6:		checksum.patch
+Patch7:		imap-gss.patch
 URL:		http://wiki.github.com/facebook/hiphop-php/
 BuildRequires:	binutils-devel
 BuildRequires:	bison >= 2.3
@@ -136,6 +138,9 @@ work smoothly with Apache.
 
 mv folly-*/* hphp/submodules/folly
 
+%patch6 -p1
+%patch7 -p1
+
 #%patch5 -p1
 
 ln -s libevent-1.4.*-stable libevent
diff --git a/checksum.patch b/checksum.patch
new file mode 100644
index 0000000..1ef4df3
--- /dev/null
+++ b/checksum.patch
@@ -0,0 +1,24 @@
+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-01 23:57:39.000000000 +0200
++++ hhvm-HHVM-2.3.2/hphp/third_party/folly/folly/Checksum.cpp	2014-01-01 23:57:45.449293562 +0200
+@@ -25,7 +25,7 @@
+ 
+ namespace detail {
+ 
+-#if defined(__x86_64__) && defined (__GNUC__)
++#if defined(__x86_64__) && defined (__GNUC__) && 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
new file mode 100644
index 0000000..0437d6c
--- /dev/null
+++ b/imap-gss.patch
@@ -0,0 +1,17 @@
+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/c6264399e02dfcabc94205612c0a3235a9db7205