[packages/hiphop-php] use system folly, minimizes broken things for now

[glen]

commit 6147aa3ca117e0b048936cee8ec134c799db06ef
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Oct 6 03:01:42 2013 +0300

    use system folly, minimizes broken things for now

 hiphop-php.spec    |  2 ++
 system-folly.patch | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+)
---
diff --git a/hiphop-php.spec b/hiphop-php.spec
index 69c348f..7edd297 100644
--- a/hiphop-php.spec
+++ b/hiphop-php.spec
@@ -24,6 +24,7 @@ Patch0:		cmake-missing-library.patch
 Patch1:		libevent14.patch
 Patch3:		system-xhp.patch
 Patch4:		system-libafdt.patch
+Patch5:		system-folly.patch
 URL:		http://wiki.github.com/facebook/hiphop-php/
 BuildRequires:	binutils-devel
 BuildRequires:	bison >= 2.3
@@ -73,6 +74,7 @@ Apache and mod_php.
 
 %prep
 %setup -q -n %{name}-HPHP-%{version} -a1
+%patch5 -p1
 
 ln -s libevent-1.4.*-stable libevent
 %{__patch} -d libevent -p1 < hphp/third_party/libevent-1.4.14.fb-changes.diff
diff --git a/system-folly.patch b/system-folly.patch
new file mode 100644
index 0000000..c75dd73
--- /dev/null
+++ b/system-folly.patch
@@ -0,0 +1,21 @@
+--- hiphop-php-HPHP-2.1.0/CMake/HPHPFindLibs.cmake	2013-10-05 23:48:42.004063624 +0300
++++ hiphop-php-HPHP-2.1.0/CMake/HPHPFindLibs.cmake	2013-10-05 23:53:12.886618141 +0300
+@@ -136,7 +136,7 @@
+ include_directories("${HPHP_HOME}/hphp/third_party/libmbfl/filter")
+ include_directories("${HPHP_HOME}/hphp/third_party/lz4")
+ include_directories("${HPHP_HOME}/hphp/third_party/double-conversion/src")
+-include_directories("${HPHP_HOME}/hphp/third_party/folly")
++include_directories("/usr/include/folly")
+ 
+ # ICU
+ find_package(ICU REQUIRED)
+--- hiphop-php-HPHP-2.1.0/./hphp/CMakeLists.txt~	2013-07-12 21:00:55.000000000 +0300
++++ hiphop-php-HPHP-2.1.0/./hphp/CMakeLists.txt	2013-10-05 23:49:20.482513660 +0300
+@@ -59,7 +59,6 @@
+ add_subdirectory(third_party/timelib)
+ add_subdirectory(third_party/lz4)
+ add_subdirectory(third_party/double-conversion)
+-add_subdirectory(third_party/folly)
+ 
+ foreach (CXX_FILE ${CXX_SOURCES})
+ 	if(${CXX_FILE} MATCHES ".no.cpp$")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hiphop-php.git/commitdiff/1c7ec8177faf90a03f1eb6711cb53159cc0d0dc1