Remove double-conversion as a source dep in OS X script

Summary: double-conversion was recently added to homebrew, making it the last
folly dependency to do so. this diff modifies the existing OS X
bootstrap tool to account for that. I also added an rm for the gtest
wget, so there wasn't a leftover zip file in your repo. alternatively,
we could remove that and add it to the gitignore.

Reviewed By: @fugalh

Differential Revision: D2196000

Pulled By: @sgolemon

diff --git a/.gitignore b/.gitignore
index 89d8518ffa7be128f30ef8a7d457f5df32c317c2..26bdeae2f779fe585ba00cc655a0ac4835c4483b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,7 @@ aclocal.m4
 autom4te.cache
 build-aux
 libtool
-folly/test/gtest-1.6.0
+folly/test/gtest-1.*
 folly/folly-config.h
 folly/test/*_benchmark
 folly/test/*_test

diff --git a/folly/bootstrap-osx-homebrew.sh b/folly/bootstrap-osx-homebrew.sh
index 56e76bf534a321d18025ef64d45ff0afbd5bb3a3..688ce4ddfb9239cf96ef1fd54b9cbc5588e5325c 100755 (executable)
--- a/folly/bootstrap-osx-homebrew.sh
+++ b/folly/bootstrap-osx-homebrew.sh
@@ -10,27 +10,13 @@ brewget() {
 }
 
 # tool dependencies: autotools and scons (for double-conversion)
-brewget autoconf automake libtool scons
+brewget autoconf automake libtool
 
 # dependencies
-brewget glog gflags boost libevent
-
-# Install the double-conversion library.
-# NB their install target installs the libs but not the headers, hence the
-# CPPFLAGS
-test -d double-conversion ||
-    git clone https://github.com/google/double-conversion.git
-pushd double-conversion
-make
-# fool libtool into using static linkage
-# (this won't work if you've already installed libdouble-conversion into a
-# default search path)
-rm -f libdouble-conversion*dylib
-DOUBLE_CONVERSION_HOME=$(pwd)
-popd
+brewget glog gflags boost libevent double-conversion
 
 autoreconf -i
-./configure CPPFLAGS=-I"$DOUBLE_CONVERSION_HOME" LDFLAGS=-L"$DOUBLE_CONVERSION_HOME"
+./configure
 
 pushd test
 test -e gtest-1.7.0.zip || {