From 2ef7ef7493364a4c7a536f0faa4d5f7d1a3425c6 Mon Sep 17 00:00:00 2001 From: Hans Fugal Date: Tue, 9 Jun 2015 12:33:21 -0700 Subject: [PATCH] fix osx bootstrap for new double-conversion directory structure Summary: Because https://github.com/google/double-conversion/commit/64702b40a2499702f9157ef015f0da6e006114bf If this breaks an existing checkout, it is because you have an old version of double-conversion now. Go ahead and `rm -rf` it, or start with a clean folly clone. Test Plan: Clean repo, `./bootstr`. Reviewed By: jsedgwick@fb.com Subscribers: exa, folly-diffs@, yfeldblum, chalfant FB internal diff: D2136836 Signature: t1:2136836:1433874889:6f6c6a7bd337e052c088aabf89955e9b21b1d8e1 --- folly/bootstrap-osx-homebrew.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/folly/bootstrap-osx-homebrew.sh b/folly/bootstrap-osx-homebrew.sh index 9843c5e0..d008a010 100755 --- a/folly/bootstrap-osx-homebrew.sh +++ b/folly/bootstrap-osx-homebrew.sh @@ -17,15 +17,11 @@ brewget glog gflags boost libevent # Install the double-conversion library. # NB their install target installs the libs but not the headers, hence the -# CPPFLAGS and link shenanigans. -test -d double-conversion || { +# CPPFLAGS +test -d double-conversion || git clone https://github.com/floitsch/double-conversion.git - pushd double-conversion/src - ln -s . double-conversion - popd -} pushd double-conversion -scons +make # fool libtool into using static linkage # (this won't work if you've already installed libdouble-conversion into a # default search path) @@ -34,7 +30,7 @@ DOUBLE_CONVERSION_HOME=$(pwd) popd autoreconf -i -./configure CPPFLAGS=-I"$DOUBLE_CONVERSION_HOME/src" LDFLAGS=-L"$DOUBLE_CONVERSION_HOME" +./configure CPPFLAGS=-I"$DOUBLE_CONVERSION_HOME" LDFLAGS=-L"$DOUBLE_CONVERSION_HOME" pushd test test -e gtest-1.7.0.zip || { -- 2.34.1