[packages/hhvm] update folly to 311c98e; upstream fixes

[glen]

commit 349ae08495b7e692e040823e538d1f445ee52a6d
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Jan 7 22:08:23 2014 +0200

    update folly to 311c98e; upstream fixes

 checksum.patch | 10 +++++-----
 hhvm.spec      | 12 +++++-------
 2 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/hhvm.spec b/hhvm.spec
index ecd58a2..93953e6 100644
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -7,7 +7,7 @@
 Summary:	Virtual Machine, Runtime, and JIT for PHP
 Name:		hhvm
 Version:	2.3.2
-Release:	0.21
+Release:	0.22
 License:	PHP 3.01
 Group:		Development/Languages
 Source0:	https://github.com/facebook/hhvm/archive/HHVM-%{version}.tar.gz
@@ -15,8 +15,8 @@ Source0:	https://github.com/facebook/hhvm/archive/HHVM-%{version}.tar.gz
 # 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/4d6d659/folly-0.1-4d6d659.tar.gz
-# Source2-md5:	2e7c941f737c8e0a449b8116e7615656
+Source2:	https://github.com/facebook/folly/archive/311c98e/folly-0.1-311c98e.tar.gz
+# Source2-md5:	338c206bccfa1a19eeb45396cd6adac6
 Source3:	%{name}-fcgi.init
 Source4:	%{name}-fcgi.sysconfig
 Source100:	get-source.sh
@@ -185,8 +185,6 @@ C++.
 %setup -q -a1 -a2 -n %{name}-HHVM-%{version}
 
 mv folly-*/* hphp/submodules/folly
-# https://github.com/facebook/folly/pull/44
-sed -i -e '21 d' hphp/third_party/folly/folly/detail/Malloc.h
 
 %patch6 -p1
 %patch7 -p1
@@ -267,7 +265,7 @@ export HHVM_REPO_SCHEMA=$(date +%N_%s)
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/%{name}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 %{__make} install \
 	HPHP_HOME=$(pwd) \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -343,7 +341,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc README.md hphp/NEWS
-%dir /etc/%{name}
+%dir %{_sysconfdir}/%{name}
 %attr(755,root,root) %{_bindir}/hhvm
 %attr(755,root,root) %{_bindir}/hphp
 %attr(755,root,root) %{_libdir}/libevent-1.4.so.*.*.*
diff --git a/checksum.patch b/checksum.patch
index 1ef4df3..8a41f8e 100644
--- a/checksum.patch
+++ b/checksum.patch
@@ -11,14 +11,14 @@ HHVM-2.3.2/hphp/third_party/folly/folly/Checksum.cpp:57:61: error: ‘__builtin_
      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
+--- 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__)
-+#if defined(__x86_64__) && defined (__GNUC__) && 0
+ #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,
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/349ae08495b7e692e040823e538d1f445ee52a6d