SharedMutex potential lost wakeup with exactly 3 or 4 contending writers

[folly.git] / README

diff --git a/README b/README
index 496f2af6e0f4a30981d5b6eb0b3a16ac8922267f..47e1c1a78cc36570b0af54f6afb6e35718fd3604 100644 (file)
--- a/README
+++ b/README
@@ -16,7 +16,7 @@ Dependencies
 folly requires gcc 4.8+ and a version of boost compiled with C++11 support.
 
 Please download googletest from
-https://googletest.googlecode.com/files/gtest-1.6.0.zip and unzip it in the
+https://googletest.googlecode.com/files/gtest-1.7.0.zip and unzip it in the
 folly/test subdirectory.
 
 Ubuntu 13.10
@@ -62,24 +62,31 @@ In the folly directory, run
   make check
   sudo make install
 
+OS X
+----
+There is a bootstrap script if you use Homebrew (http://brew.sh/). At the time
+of writing (OS X Yosemite 10.10.1) the default compiler (clang) has some
+issues building, but gcc 4.9.2 from Homebrew works fine. (This is taken care
+of by the bootstrap script.)
+
+  cd folly
+  ./bootstrap-osx-homebrew.sh
+  make
+  make check
 
 Other Linux distributions
 -------------------------
 
-- double-conversion (http://code.google.com/p/double-conversion/)
-
-    By default, the build tooling for double-conversion does not build
-    any libraries, which folly requires.  To build the necessary libraries
-    copy folly/SConstruct.double-conversion to your double-conversion
-    source directory before building:
-
-      [double-conversion/] scons -f SConstruct.double-conversion
+- double-conversion (https://github.com/floitsch/double-conversion/)
 
-    Then set CPPFLAGS/LDFLAGS so that folly can find your double-conversion
-    build:
+  Download and build double-conversion.
+  You may need to tell configure where to find it.
 
-      [folly/] LDFLAGS=-L<double-conversion>/ CPPFLAGS=-I<double-conversion>/src/
-        configure ...
+  [double-conversion/] ln -s src double-conversion
+ 
+  [folly/] ./configure LDFLAGS=-L$DOUBLE_CONVERISON_HOME/ CPPFLAGS=-I$DOUBLE_CONVERISON_HOME/
+ 
+  [folly/] LD_LIBRARY_PATH=$DOUBLE_CONVERISON_HOME/ make
 
 - additional platform specific dependencies: