1 diff -Naur dogecoin-0.8.5.3-rc3.orig/bitcoin-qt.pro dogecoin-0.8.5.3-rc3/bitcoin-qt.pro
2 --- dogecoin-0.8.5.3-rc3.orig/bitcoin-qt.pro 2013-11-28 21:17:05.000000000 -0500
3 +++ dogecoin-0.8.5.3-rc3/bitcoin-qt.pro 2013-11-29 14:53:00.960537685 -0500
5 INCLUDEPATH += src src/json src/qt
7 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
8 -DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
9 +DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE LEVELDB_WITHOUT_MEMENV
10 CONFIG += no_include_pwd
14 QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs qtaccessiblewidgets
17 +contains(USE_SYSTEM_LEVELDB, 1) {
20 INCLUDEPATH += src/leveldb/include src/leveldb/helpers
21 -LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a
22 +LIBS += $$PWD/src/leveldb/libleveldb.a
24 # we use QMAKE_CXXFLAGS_RELEASE even without RELEASE=1 because we use RELEASE to indicate linking preferences not -O preferences
25 - genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a
26 + genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a
28 # make an educated guess about what the ranlib command is called
29 isEmpty(QMAKE_RANLIB) {
30 QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib)
33 - genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a
34 + genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a
36 genleveldb.target = $$PWD/src/leveldb/libleveldb.a
37 genleveldb.depends = FORCE
38 PRE_TARGETDEPS += $$PWD/src/leveldb/libleveldb.a
39 QMAKE_EXTRA_TARGETS += genleveldb
41 # Gross ugly hack that depends on qmake internals, unfortunately there is no other way to do it.
42 -QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb ; $(MAKE) clean
43 +QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb && $(MAKE) clean || true
46 # regenerate src/build.h
47 !win32|contains(USE_BUILD_INFO, 1) {
48 diff -Naur dogecoin-0.8.5.3-rc3.orig/src/leveldb.cpp dogecoin-0.8.5.3-rc3/src/leveldb.cpp
49 --- dogecoin-0.8.5.3-rc3.orig/src/leveldb.cpp 2013-11-28 21:17:05.000000000 -0500
50 +++ dogecoin-0.8.5.3-rc3/src/leveldb.cpp 2013-11-29 14:55:33.760543008 -0500
52 #include <leveldb/env.h>
53 #include <leveldb/cache.h>
54 #include <leveldb/filter_policy.h>
55 -#include <memenv/memenv.h>
56 +#ifndef LEVELDB_WITHOUT_MEMENV
60 #include <boost/filesystem.hpp>
63 options = GetOptions(nCacheSize);
64 options.create_if_missing = true;
66 +#ifndef LEVELDB_WITHOUT_MEMENV
67 penv = leveldb::NewMemEnv(leveldb::Env::Default());
70 + throw std::runtime_error("CLevelDB(): compiled without memenv support");
74 printf("Wiping LevelDB in %s\n", path.string().c_str());
75 diff -Naur dogecoin-0.8.5.3-rc3.orig/src/makefile.unix dogecoin-0.8.5.3-rc3/src/makefile.unix
76 --- dogecoin-0.8.5.3-rc3.orig/src/makefile.unix 2013-11-28 21:17:05.000000000 -0500
77 +++ dogecoin-0.8.5.3-rc3/src/makefile.unix 2013-11-29 15:08:58.337571033 -0500
79 # adds some defaults in front. Unfortunately, LDFLAGS=... $(LDFLAGS) does not work.
80 xLDFLAGS=$(LDHARDENING) $(LDFLAGS)
83 - leveldb/libleveldb.a \
109 + obj-test/leveldb.o \
110 + $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) \
115 @@ -156,15 +162,25 @@
116 test check: test_dogecoin FORCE
119 +ifdef USE_SYSTEM_LEVELDB
121 + TESTLIBS += -lmemenv
127 -LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
128 +LIBS += $(CURDIR)/leveldb/libleveldb.a
129 +TESTLIBS += $(CURDIR)/leveldb/libmemenv.a
130 DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
131 DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
132 leveldb/libleveldb.a:
133 - @echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && cd ..
134 + @echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a && cd ..
135 +leveldb/libmemenv.a:
136 + @echo "Building LevelDB memenv ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libmemenv.a && cd ..
137 +OBJS += leveldb/libleveldb.a
138 +TESTOBJS += leveldb/libmemenv.a
141 # auto-generated dependencies:
143 @@ -175,33 +191,34 @@
144 version.cpp: obj/build.h
145 DEFS += -DHAVE_BUILD_INFO
147 -obj/%-sse2.o: %-sse2.cpp
148 - $(CXX) -c $(xCXXFLAGS) -msse2 -MMD -MF $(@:%.o=%.d) -o $@ $<
150 @cp $(@:%.o=%.d) $(@:%.o=%.P); \
151 - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
152 + sed -e 's/\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
153 -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
156 +obj/%-sse2.o: %-sse2.cpp
157 + $(CXX) -c $(xCXXFLAGS) -msse2 -MMD -MF $(@:%.o=%.d) -o $@ $<
161 - $(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
162 - @cp $(@:%.o=%.d) $(@:%.o=%.P); \
163 - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
164 - -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
166 + $(CXX) -c $(xCXXFLAGS) -DLEVELDB_WITHOUT_MEMENV -MMD -MF $(@:%.o=%.d) -o $@ $<
169 -dogecoind: $(OBJS:obj/%=obj/%)
171 $(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS)
173 -TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
175 obj-test/%.o: test/%.cpp
176 $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
177 - @cp $(@:%.o=%.d) $(@:%.o=%.P); \
178 - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
179 - -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
183 +obj-test/leveldb.o: leveldb.cpp
184 + $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
187 +TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
189 -test_dogecoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
190 +test_dogecoin: $(TESTOBJS)
191 $(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ $(TESTLIBS) $(xLDFLAGS) $(LIBS)