Merge pull request #3035 from fanquake/remove-homebrew-patches
Remove obselete HomeBrew patches
This commit is contained in:
commit
e21a435dd1
2 changed files with 0 additions and 80 deletions
|
@ -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
|
|
@ -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 += \
|
Loading…
Reference in a new issue