From 5a61553a143b0a37d59ac739529560edc1bf4d90 Mon Sep 17 00:00:00 2001 From: Dominyk Tiller Date: Sat, 23 Aug 2014 04:15:32 +0100 Subject: [PATCH 1/2] Build-osx: Force Fix. Removes the unnecessary directions that encourage people to force install openssl into /usr/local with Homebrew. Unnecessary, and potentially quite risky. @theuni okayed this removal [here](https://github.com/bitcoin/bitcoin/pull/4740#issuecomment-53076840). --- doc/build-osx.md | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/doc/build-osx.md b/doc/build-osx.md index c19d87d38..4dfde0f35 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -71,19 +71,7 @@ Instructions: Homebrew brew install autoconf automake libtool boost miniupnpc openssl pkg-config protobuf qt -Note: After you have installed the dependencies, you should check that the Homebrew installed version of OpenSSL is the one available for compilation. You can check this by typing - - openssl version - -into Terminal. You should see OpenSSL 1.0.1h 5 Jun 2014. - -If not, you can ensure that the Homebrew OpenSSL is correctly linked by running - - brew link openssl --force - -Rerunning "openssl version" should now return the correct version. If it -doesn't, make sure `/usr/local/bin` comes before `/usr/bin` in your -PATH. +Make sure `/usr/local/bin` comes before `/usr/bin` in your PATH. #### Installing berkeley-db4 using Homebrew From df920c6d49137a667dbca5dd0763cb4e7de3a3b1 Mon Sep 17 00:00:00 2001 From: Dominyk Tiller Date: Sat, 23 Aug 2014 04:36:20 +0100 Subject: [PATCH 2/2] Build-osx: Force Fix. Kills the "make" line as well. --- doc/build-osx.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/build-osx.md b/doc/build-osx.md index 4dfde0f35..ade9eb466 100644 --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -71,8 +71,6 @@ Instructions: Homebrew brew install autoconf automake libtool boost miniupnpc openssl pkg-config protobuf qt -Make sure `/usr/local/bin` comes before `/usr/bin` in your PATH. - #### Installing berkeley-db4 using Homebrew The homebrew package for berkeley-db4 has been broken for some time. It will install without Java though.