Mac: Use brew installed sqlite instead of the system one (#434)

Link to issue #414

Author: JohanLorenzo

.travis.yml

@@ -20,7 +20,6 @@ matrix:
   fast_finish: true
   allow_failures:
     - rust: nightly
-    - os: osx
   include:
     - sudo: required
       os: linux

README.md

@@ -83,6 +83,15 @@ $ git clone git@github.com:<username>/foxbox.git
 $ cd foxbox
 ```
 
+### Extra steps for Mac OS X
+
+Foxbox requires some up-to-date libraries (like OpenSSL). In order to make sure you have the correct packages and bindings, we recommend you to install brew and to run:
+
+``` bash
+brew install openssl libupnp sqlite
+source tools/mac-os-x-setup.source.sh
+```
+
 ## Build time options
 ### Disable authentication
 You may want to disable endpoints authentication to ease your development process. You can do that by removing `authentication` from the `default` feature in the `Cargo.toml` file.
@@ -220,24 +229,3 @@ For an extensive write-up about cross compiling Rust programs see:
 ### Mac OS X
 
 Cross compiling on Mac hasn't been documented. A PR is welcomed. :wink:
-
-
-## Notes for Mac OS X with Brew
-
-You'll need some dependencies installed to build.
-
-``` bash
-$ brew install openssl libupnp sqlite
-```
-
-This is required to build/link the openssl crate and foxbox using homebrew's openssl:
-
-``` bash
-$ export DEP_OPENSSL_INCLUDE=/usr/local/opt/openssl/include/
-$ export OPENSSL_LIB_DIR=/usr/local/opt/openssl/lib
-$ export EXTRA_LDFLAGS=-L/usr/local/opt/openssl/lib
-```
-
-Previous versions of these instructions described setting ```OPENSSL_INCLUDE_DIR```.
-Make sure it is unset. In fact, an obsolete value may have been cached by cargo
-which is fixed by ```cargo clean```.

tools/mac-os-x-setup.source.sh

@@ -0,0 +1,9 @@
+# This script must be sourced. Please run `source tools/mac-os-x-setup.sh`
+
+# openssl and sqlite libraries are already installed on OS X base system. That's
+# why we need to explicitely specify the directories that brew installed.
+# TODO: Remove sqlite once pkg_config is able to not bubble up a system path
+# For more information, see https://github.com/fxbox/foxbox/issues/414
+export DEP_OPENSSL_INCLUDE="$(brew --prefix openssl)/include"
+export OPENSSL_LIB_DIR="$(brew --prefix openssl)/lib"
+export SQLITE3_LIB_DIR="$(brew --prefix sqlite)/lib"

tools/travis-osx.sh

@@ -4,12 +4,11 @@ set -e
 
 CURRENT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
-export OPENSSL_LIB_DIR=/usr/local/opt/openssl/lib
-export EXTRA_LDFLAGS=-L/usr/local/opt/openssl/lib
 
 install_dependencies() {
     brew update
-    brew install libupnp openssl sqlite
+    brew install openssl libupnp sqlite
+    source "$CURRENT_PATH/mac-os-x-setup.source.sh"
 }
 
 build() {