diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-09-28 02:16:50 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-09-28 02:16:50 -0700 |
| commit | e21a435dd142bfa9e6bcf68b0f08ef9212200618 (patch) | |
| tree | 908d12ad91732f23f3a4a174ed7507dfe1ae74eb | |
| parent | 7de4e47d5fd15d79316a7e925fe87d0087974613 (diff) | |
| parent | 619e76e6e65451a1af1d733ab3c12420887b429b (diff) | |
Merge pull request #3035 from fanquake/remove-homebrew-patches
Remove obselete HomeBrew patches
| -rw-r--r-- | contrib/homebrew/bitcoin.qt.pro.patch | 32 | ||||
| -rw-r--r-- | contrib/homebrew/makefile.osx.patch | 48 |
2 files changed, 0 insertions, 80 deletions
diff --git a/contrib/homebrew/bitcoin.qt.pro.patch b/contrib/homebrew/bitcoin.qt.pro.patch deleted file mode 100644 index 1001f29065..0000000000 --- a/contrib/homebrew/bitcoin.qt.pro.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro -index d938c07..e1dd4ec 100644 ---- a/bitcoin-qt.pro -+++ b/bitcoin-qt.pro -@@ -353,7 +353,7 @@ - } - - isEmpty(BDB_LIB_PATH) { -- macx:BDB_LIB_PATH = /opt/local/lib/db48 -+ macx:BDB_LIB_PATH = /usr/local/opt/berkeley-db4/lib - } - - isEmpty(BDB_LIB_SUFFIX) { -@@ -361,15 +361,15 @@ - } - - isEmpty(BDB_INCLUDE_PATH) { -- macx:BDB_INCLUDE_PATH = /opt/local/include/db48 -+ macx:BDB_INCLUDE_PATH = /usr/local/opt/berkeley-db4/include - } - - isEmpty(BOOST_LIB_PATH) { -- macx:BOOST_LIB_PATH = /opt/local/lib -+ macx:BOOST_LIB_PATH = /usr/local/opt/boost/lib - } - - isEmpty(BOOST_INCLUDE_PATH) { -- macx:BOOST_INCLUDE_PATH = /opt/local/include -+ macx:BOOST_INCLUDE_PATH = /usr/local/opt/boost/include - } - - win32:DEFINES += WIN32 diff --git a/contrib/homebrew/makefile.osx.patch b/contrib/homebrew/makefile.osx.patch deleted file mode 100644 index 287db2fdf2..0000000000 --- a/contrib/homebrew/makefile.osx.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/src/makefile.osx b/src/makefile.osx -index bef0ef3..07ef8d3 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,14 +35,14 @@ 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/libboost_chrono-mt.a \ -- $(DEPSDIR)/lib/libssl.a \ -- $(DEPSDIR)/lib/libcrypto.a \ -+ $(OPENSSLDIR)/lib/libssl.a \ -+ $(OPENSSLDIR)/lib/libcrypto.a \ - -lz - else - TESTLIBS += \ |