[packages/hhvm/dev-3.6: 11/20] fix folly undefined malloc_usable_size symbol error

[glen]

commit bbb00071efdcb4da594fcd08c91fedcec81d17e1
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Apr 6 20:44:11 2015 +0300

    fix folly undefined malloc_usable_size symbol error
    
    https://github.com/facebook/hhvm/issues/4908

 folly-malloc_usable_size.patch | 34 ++++++++++++++++++++++++++++++++++
 hhvm.spec                      |  2 ++
 2 files changed, 36 insertions(+)
---
diff --git a/hhvm.spec b/hhvm.spec
index 37c5d8a..5b43d94 100644
--- a/hhvm.spec
+++ b/hhvm.spec
@@ -71,6 +71,7 @@ Patch2:		hphpize.patch
 Patch5:		cmake.patch
 Patch6:		webscalesql-5.6-build.patch
 Patch7:		disable-fastcgi.patch
+Patch8:		folly-malloc_usable_size.patch
 URL:		https://github.com/facebook/hhvm/wiki
 BuildRequires:	ImageMagick-devel
 BuildRequires:	a52dec-libs-devel
@@ -285,6 +286,7 @@ mv mcrouter-* third-party/mcrouter/src
 #%patch5 -p1
 %patch6 -p1 -d third-party/webscalesqlclient/webscalesql-5.6
 %patch7 -p1
+%patch8 -p1 -d third-party
 
 # prefer ones from system
 rm CMake/FindBISON.cmake
diff --git a/folly-malloc_usable_size.patch b/folly-malloc_usable_size.patch
new file mode 100644
index 0000000..0118945
--- /dev/null
+++ b/folly-malloc_usable_size.patch
@@ -0,0 +1,34 @@
+https://github.com/facebook/hhvm/issues/4908
+https://github.com/hhvm/hhvm-third-party/commit/1b6b1a5e311df5e2b57f580657666be7778def54
+
+From 1b6b1a5e311df5e2b57f580657666be7778def54 Mon Sep 17 00:00:00 2001
+From: Sara Golemon <sgolemon at fb.com>
+Date: Thu, 26 Feb 2015 13:07:50 -0800
+Subject: [PATCH] Chang FOLLY_MALLOC test to focus on whether or not we have
+ malloc.h, since that's what it is defining
+
+---
+ folly/CMakeLists.txt | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/folly/CMakeLists.txt b/folly/CMakeLists.txt
+index cba4694..5005f8a 100644
+--- a/folly/CMakeLists.txt
++++ b/folly/CMakeLists.txt
+@@ -4,12 +4,14 @@ set(FOLLY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/folly")
+ # like malloc_usable_size() from either malloc.h
+ # or stdlib.h. Default is stdlib.h
+ INCLUDE(CheckCXXSourceCompiles)
+-CHECK_CXX_SOURCE_COMPILES("#include <folly/Malloc.h>
++CHECK_CXX_SOURCE_COMPILES("#include <malloc.h>
+ int main() {
+   return 0;
+ }" FOLLY_MALLOC)
+-if (NOT FOLLY_MALLOC)
++if (FOLLY_MALLOC)
+   add_definitions("-DFOLLY_HAVE_MALLOC_H=1")
++else()
++  add_definitions("-DFOLLY_HAVE_MALLOC_H=0")
+ endif()
+ 
+ if (NOT EXISTS "${FOLLY_DIR}/Portability.h")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hhvm.git/commitdiff/29a3971a9677d3f2f66508505458f8da4876b5e2