Skip to content

Commit

Permalink
fix bootstrap on osx
Browse files Browse the repository at this point in the history
 * include all dependencies
 * update `autoconf` & `configure` with correct params
 * include `make` & `make install` in the bootstrap for a better
   user experience
 * fixes #332
  • Loading branch information
r8k committed Nov 11, 2016
1 parent d07b730 commit 96d24db
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
23 changes: 16 additions & 7 deletions folly/build/bootstrap-osx-homebrew.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,31 @@ set -e
BASE_DIR="$(cd "$(dirname -- "$0")"/.. ; pwd)" # folly/folly
cd "$BASE_DIR"

brewget() {
brew_install() {
brew install $@ || brew upgrade $@
}

# tool dependencies: autotools and scons (for double-conversion)
brewget autoconf automake libtool
# 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
# now the fun part
autoreconf -ivf
./configure --disable-silent-rules --disable-dependency-tracking

# fetch googletest, if doesn't exist
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
}
popd

# make, test, install
make
make check
make install

0 comments on commit 96d24db

Please sign in to comment.