From 5d8ea9825a6580771e240d093878736bd6e305f6 Mon Sep 17 00:00:00 2001
From: r8k <rajivk085@gmail.com>
Date: Mon, 28 Nov 2016 11:26:46 -0800
Subject: [PATCH] fix bootstrap on osx

Summary:
* include all dependencies
 * update `autoconf` & `configure` with correct params
 * include `make` & `make install` in the bootstrap for a better user experience
 * fixes #332
Closes https://github.com/facebook/folly/pull/513

Reviewed By: yfeldblum

Differential Revision: D4177362

Pulled By: Orvid

fbshipit-source-id: c62d6633c382fca57bb06db08724a7355b71bdb3
---
 README.md                             |  2 -
 folly/build/bootstrap-osx-homebrew.sh | 53 +++++++++++++++++++++------
 2 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 9b5f4ac4..bc6c4747 100644
--- a/README.md
+++ b/README.md
@@ -147,8 +147,6 @@ You may also use `folly/build/bootstrap-osx-homebrew.sh` to build against `maste
 ```
   cd folly
   ./build/bootstrap-osx-homebrew.sh
-  make
-  make check
 ```
 
 #### OS X (MacPorts)
diff --git a/folly/build/bootstrap-osx-homebrew.sh b/folly/build/bootstrap-osx-homebrew.sh
index c7c350c3..af8c2011 100755
--- a/folly/build/bootstrap-osx-homebrew.sh
+++ b/folly/build/bootstrap-osx-homebrew.sh
@@ -8,22 +8,53 @@ set -e
 BASE_DIR="$(cd "$(dirname -- "$0")"/.. ; pwd)"  # folly/folly
 cd "$BASE_DIR"
 
-brewget() {
+# brew install alias
+brew_install() {
     brew install $@ || brew upgrade $@
 }
 
-# tool dependencies: autotools and scons (for double-conversion)
-brewget autoconf automake libtool
+# install deps
+install_deps() {
+	# folly deps
+	dependencies=(autoconf automake libtool pkg-config double-conversion glog gflags boost libevent xz snappy lz4 jemalloc openssl)
 
-# dependencies
-brewget glog gflags boost libevent double-conversion
+	# fetch deps
+	for dependency in ${dependencies[@]}; do
+		brew_install ${dependency}
+	done
+}
 
-autoreconf -i
-./configure
+# set env flags
+export_flags() {
+	# fetch opt dirs
+	OPT_GFLAGS=$(brew --prefix gflags)
+	OPT_OPENSSL=$(brew --prefix openssl)
 
-pushd test
-test -e gtest-1.7.0.zip || {
-    curl -O https://googletest.googlecode.com/files/gtest-1.7.0.zip
-    unzip gtest-1.7.0.zip
+	# export LDFLAGS
+	export LDFLAGS=-L${OPT_OPENSSL}/lib
+	export CPPFLAGS=-I${OPT_OPENSSL}/include
+	export GFLAGS_LIBS=-L${OPT_GFLAGS}/lib
+	export GFLAGS_CFLAGS=-I${OPT_GFLAGS}/include
 }
+
+# now the fun part
+install_deps
+export_flags
+autoreconf -ivf
+./configure --disable-silent-rules --disable-dependency-tracking
+
+# fetch googletest, if doesn't exist
+pushd test
+GTEST_VER=1.7.0
+GTEST_DIR=gtest-${GTEST_VER}
+if [ ! -d ${GTEST_DIR} ]; then
+	mkdir ${GTEST_DIR}
+    curl -SL \
+    	https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz | \
+    	tar -xvzf - --strip-components=1 -C ${GTEST_DIR}
+fi
 popd
+
+# make, test, install
+make
+make install
-- 
2.34.1