Commit b75ef0a0 authored by Mike Arpaia's avatar Mike Arpaia Committed by Sara Golemon

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
parent 6b6e6ae3
...@@ -13,7 +13,7 @@ aclocal.m4 ...@@ -13,7 +13,7 @@ aclocal.m4
autom4te.cache autom4te.cache
build-aux build-aux
libtool libtool
folly/test/gtest-1.6.0 folly/test/gtest-1.*
folly/folly-config.h folly/folly-config.h
folly/test/*_benchmark folly/test/*_benchmark
folly/test/*_test folly/test/*_test
......
...@@ -10,27 +10,13 @@ brewget() { ...@@ -10,27 +10,13 @@ brewget() {
} }
# tool dependencies: autotools and scons (for double-conversion) # tool dependencies: autotools and scons (for double-conversion)
brewget autoconf automake libtool scons brewget autoconf automake libtool
# dependencies # dependencies
brewget glog gflags boost libevent brewget glog gflags boost libevent double-conversion
# 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
autoreconf -i autoreconf -i
./configure CPPFLAGS=-I"$DOUBLE_CONVERSION_HOME" LDFLAGS=-L"$DOUBLE_CONVERSION_HOME" ./configure
pushd test pushd test
test -e gtest-1.7.0.zip || { test -e gtest-1.7.0.zip || {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment