diff options
| author | Colin Dean <git@cad.cx> | 2012-12-12 11:52:38 -0500 |
|---|---|---|
| committer | Colin Dean <git@cad.cx> | 2013-02-19 21:45:39 -0500 |
| commit | 68cb1cd6b6945c9068b0cdfe43fb8227819b3c45 (patch) | |
| tree | 0946d4d30cf0c8992487cadfb537d31c8b4eef67 /contrib | |
| parent | 44d7f4cbebd446f8f4a48ff9048d4549c0e2448a (diff) | |
reformat OS X build instrcs, add 10.8 + Homebrew
* reformatted the entire document to look pretty in both standard text and
Markdown
* incorporated [my OS X 10.8 build instructions with Homebrew as the package
manager](http://bitcoin.stackexchange.com/questions/3672/trouble-compiling-bitcoind-on-osx-with-homebrew/5253#5253)
* incorporated @gavinandresen's MacPorts and release build instructions based on
an earlier revision of this commit
* added makefile patch necessary for Homebrew compilation to `contrib`
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/homebrew/makefile.osx.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/contrib/homebrew/makefile.osx.patch b/contrib/homebrew/makefile.osx.patch new file mode 100644 index 0000000000..340de0efdf --- /dev/null +++ b/contrib/homebrew/makefile.osx.patch @@ -0,0 +1,47 @@ +diff --git a/src/makefile.osx b/src/makefile.osx +index 8b7c559..8a0560c 100644 +--- a/src/makefile.osx ++++ b/src/makefile.osx +@@ -7,17 +7,21 @@ + # Originally by Laszlo Hanyecz (solar@heliacal.net) + + CXX=llvm-g++ +-DEPSDIR=/opt/local ++DEPSDIR=/usr/local ++DB4DIR=/usr/local/opt/berkeley-db4 ++OPENSSLDIR=/usr/local/opt/openssl + + INCLUDEPATHS= \ + -I"$(CURDIR)" \ +- -I"$(CURDIR)"/obj \ ++ -I"$(CURDIR)/obj" \ + -I"$(DEPSDIR)/include" \ +- -I"$(DEPSDIR)/include/db48" ++ -I"$(DB4DIR)/include" \ ++ -I"$(OPENSSLDIR)/include" + + LIBPATHS= \ + -L"$(DEPSDIR)/lib" \ +- -L"$(DEPSDIR)/lib/db48" ++ -L"$(DB4DIR)/lib" \ ++ -L"$(OPENSSLDIR)/lib" + + USE_UPNP:=1 + USE_IPV6:=1 +@@ -31,13 +35,13 @@ ifdef STATIC + TESTLIBS += \ + $(DEPSDIR)/lib/libboost_unit_test_framework-mt.a + LIBS += \ +- $(DEPSDIR)/lib/db48/libdb_cxx-4.8.a \ ++ $(DB4DIR)/lib/libdb_cxx-4.8.a \ + $(DEPSDIR)/lib/libboost_system-mt.a \ + $(DEPSDIR)/lib/libboost_filesystem-mt.a \ + $(DEPSDIR)/lib/libboost_program_options-mt.a \ + $(DEPSDIR)/lib/libboost_thread-mt.a \ +- $(DEPSDIR)/lib/libssl.a \ +- $(DEPSDIR)/lib/libcrypto.a \ ++ $(OPENSSLDIR)/lib/libssl.a \ ++ $(OPENSSLDIR)/lib/libcrypto.a \ + -lz + else + TESTLIBS += \ |