Skip to content

Commit

Permalink
Update readme and change patch so -p1 is required like the libevent p…
Browse files Browse the repository at this point in the history
…atch
  • Loading branch information
Scott MacVicar committed Jun 28, 2010
1 parent dd28558 commit 5f129a4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ HipHop is a source code transformer which transforms PHP source code into highly
* [Issue Tracker](http://github.com/facebook/hiphop-php/issues)

## Required Packages

The latest information is available on the [wiki](http://wiki.github.com/facebook/hiphop-php/building-and-installing)

* cmake *2.6 is the minimum version*
* g++/gcc *4.1 is the minimum version*
* Boost *1.37 is the minimum version*
Expand All @@ -24,13 +27,16 @@ HipHop is a source code transformer which transforms PHP source code into highly
* zlib
* tbb *Intel's Thread Building Blocks*
* [Oniguruma](http://www.geocities.jp/kosako3/oniguruma/)
* libpcre
* libexpat
* libmemcached

The following packages have had slight modifications added to them. Patches are provided and should be made against the current source copies.

* [libcurl](http://curl.haxx.se/download.html)
* src/third_party/libcurl.fb-changes.diff
* [libevent 1.4](http://www.monkey.org/~provos/libevent/)
* src/third_party/libevent.fb-changes.diff
* src/third_party/libevent-1.4.13.fb-changes.diff OR src/third_party/libevent-1.4.14.fb-changes.diff

## Installation

Expand Down
8 changes: 4 additions & 4 deletions src/third_party/libcurl.fb-changes.diff
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Index: include/curl/multi.h
RCS file: /cvsroot/curl/curl/include/curl/multi.h,v
retrieving revision 1.45
diff -u -r1.45 multi.h
--- include/curl/multi.h 20 May 2008 10:21:50 -0000 1.45
+++ include/curl/multi.h 29 Jan 2010 23:45:18 -0000
--- curl-old/include/curl/multi.h 20 May 2008 10:21:50 -0000 1.45
+++ curl-new/include/curl/multi.h 29 Jan 2010 23:45:18 -0000
@@ -135,6 +135,19 @@
int *max_fd);

Expand All @@ -30,8 +30,8 @@ Index: lib/multi.c
RCS file: /cvsroot/curl/curl/lib/multi.c,v
retrieving revision 1.210
diff -u -r1.210 multi.c
--- lib/multi.c 28 Jan 2010 15:34:18 -0000 1.210
+++ lib/multi.c 29 Jan 2010 23:45:19 -0000
--- curl-old/lib/multi.c 28 Jan 2010 15:34:18 -0000 1.210
+++ curl-new/lib/multi.c 29 Jan 2010 23:45:19 -0000
@@ -42,6 +42,7 @@
#include "sendf.h"
#include "timeval.h"
Expand Down

0 comments on commit 5f129a4

Please sign in to comment.