| diff -Naur litecoin-0.8.5.3-rc3.orig/bitcoin-qt.pro litecoin-0.8.5.3-rc3/bitcoin-qt.pro |
| --- litecoin-0.8.5.3-rc3.orig/bitcoin-qt.pro 2013-11-28 21:17:05.000000000 -0500 |
| +++ litecoin-0.8.5.3-rc3/bitcoin-qt.pro 2013-11-29 14:53:00.960537685 -0500 |
| @@ -5,7 +5,7 @@ |
| INCLUDEPATH += src src/json src/qt |
| QT += core gui network |
| greaterThan(QT_MAJOR_VERSION, 4): QT += widgets |
| -DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE |
| +DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE LEVELDB_WITHOUT_MEMENV |
| CONFIG += no_include_pwd |
| CONFIG += thread |
| |
| @@ -101,25 +101,30 @@ |
| QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs qtaccessiblewidgets |
| } |
| |
| +contains(USE_SYSTEM_LEVELDB, 1) { |
| + LIBS += -lleveldb |
| +} else { |
| INCLUDEPATH += src/leveldb/include src/leveldb/helpers |
| -LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a |
| +LIBS += $$PWD/src/leveldb/libleveldb.a |
| !win32 { |
| # we use QMAKE_CXXFLAGS_RELEASE even without RELEASE=1 because we use RELEASE to indicate linking preferences not -O preferences |
| - genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a |
| + genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a |
| } else { |
| # make an educated guess about what the ranlib command is called |
| isEmpty(QMAKE_RANLIB) { |
| QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib) |
| } |
| LIBS += -lshlwapi |
| - 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 |
| + 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 |
| } |
| genleveldb.target = $$PWD/src/leveldb/libleveldb.a |
| genleveldb.depends = FORCE |
| PRE_TARGETDEPS += $$PWD/src/leveldb/libleveldb.a |
| QMAKE_EXTRA_TARGETS += genleveldb |
| +} |
| # Gross ugly hack that depends on qmake internals, unfortunately there is no other way to do it. |
| -QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb ; $(MAKE) clean |
| +QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb && $(MAKE) clean || true |
| + |
| |
| # regenerate src/build.h |
| !win32|contains(USE_BUILD_INFO, 1) { |
| diff -Naur litecoin-0.8.5.3-rc3.orig/src/leveldb.cpp litecoin-0.8.5.3-rc3/src/leveldb.cpp |
| --- litecoin-0.8.5.3-rc3.orig/src/leveldb.cpp 2013-11-28 21:17:05.000000000 -0500 |
| +++ litecoin-0.8.5.3-rc3/src/leveldb.cpp 2013-11-29 14:55:33.760543008 -0500 |
| @@ -8,7 +8,9 @@ |
| #include <leveldb/env.h> |
| #include <leveldb/cache.h> |
| #include <leveldb/filter_policy.h> |
| -#include <memenv/memenv.h> |
| +#ifndef LEVELDB_WITHOUT_MEMENV |
| +#include <memenv.h> |
| +#endif |
| |
| #include <boost/filesystem.hpp> |
| |
| @@ -43,8 +45,12 @@ |
| options = GetOptions(nCacheSize); |
| options.create_if_missing = true; |
| if (fMemory) { |
| +#ifndef LEVELDB_WITHOUT_MEMENV |
| penv = leveldb::NewMemEnv(leveldb::Env::Default()); |
| options.env = penv; |
| +#else |
| + throw std::runtime_error("CLevelDB(): compiled without memenv support"); |
| +#endif |
| } else { |
| if (fWipe) { |
| printf("Wiping LevelDB in %s\n", path.string().c_str()); |
| diff -Naur litecoin-0.8.5.3-rc3.orig/src/makefile.unix litecoin-0.8.5.3-rc3/src/makefile.unix |
| --- litecoin-0.8.5.3-rc3.orig/src/makefile.unix 2013-11-28 21:17:05.000000000 -0500 |
| +++ litecoin-0.8.5.3-rc3/src/makefile.unix 2013-11-29 15:08:58.337571033 -0500 |
| @@ -110,8 +110,7 @@ |
| # adds some defaults in front. Unfortunately, LDFLAGS=... $(LDFLAGS) does not work. |
| xLDFLAGS=$(LDHARDENING) $(LDFLAGS) |
| |
| -OBJS= \ |
| - leveldb/libleveldb.a \ |
| +BASEOBJS := \ |
| obj/alert.o \ |
| obj/version.o \ |
| obj/checkpoints.o \ |
| @@ -120,7 +119,6 @@ |
| obj/crypter.o \ |
| obj/key.o \ |
| obj/db.o \ |
| - obj/init.o \ |
| obj/keystore.o \ |
| obj/main.o \ |
| obj/net.o \ |
| @@ -141,9 +139,17 @@ |
| obj/hash.o \ |
| obj/bloom.o \ |
| obj/noui.o \ |
| - obj/leveldb.o \ |
| obj/txdb.o |
| |
| +OBJS := \ |
| + obj/leveldb.o \ |
| + obj/init.o \ |
| + $(BASEOBJS) |
| + |
| +TESTOBJS := \ |
| + obj-test/leveldb.o \ |
| + $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) \ |
| + $(BASEOBJS) |
| |
| ifdef USE_SSE2 |
| DEFS += -DUSE_SSE2 |
| @@ -156,15 +162,25 @@ |
| test check: test_litecoin FORCE |
| ./test_litecoin |
| |
| +ifdef USE_SYSTEM_LEVELDB |
| + LIBS += -lleveldb |
| + TESTLIBS += -lmemenv |
| +else |
| # |
| # LevelDB support |
| # |
| MAKEOVERRIDES = |
| -LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a |
| +LIBS += $(CURDIR)/leveldb/libleveldb.a |
| +TESTLIBS += $(CURDIR)/leveldb/libmemenv.a |
| DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) |
| DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) |
| leveldb/libleveldb.a: |
| - @echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && cd .. |
| + @echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a && cd .. |
| +leveldb/libmemenv.a: |
| + @echo "Building LevelDB memenv ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libmemenv.a && cd .. |
| +OBJS += leveldb/libleveldb.a |
| +TESTOBJS += leveldb/libmemenv.a |
| +endif |
| |
| # auto-generated dependencies: |
| -include obj/*.P |
| @@ -175,33 +191,34 @@ |
| version.cpp: obj/build.h |
| DEFS += -DHAVE_BUILD_INFO |
| |
| -obj/%-sse2.o: %-sse2.cpp |
| - $(CXX) -c $(xCXXFLAGS) -msse2 -MMD -MF $(@:%.o=%.d) -o $@ $< |
| +P_TO_D = \ |
| @cp $(@:%.o=%.d) $(@:%.o=%.P); \ |
| - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ |
| + sed -e 's/\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ |
| -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ |
| rm -f $(@:%.o=%.d) |
| |
| +obj/%-sse2.o: %-sse2.cpp |
| + $(CXX) -c $(xCXXFLAGS) -msse2 -MMD -MF $(@:%.o=%.d) -o $@ $< |
| + $(P_TO_D) |
| + |
| obj/%.o: %.cpp |
| - $(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $< |
| - @cp $(@:%.o=%.d) $(@:%.o=%.P); \ |
| - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ |
| - -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ |
| - rm -f $(@:%.o=%.d) |
| + $(CXX) -c $(xCXXFLAGS) -DLEVELDB_WITHOUT_MEMENV -MMD -MF $(@:%.o=%.d) -o $@ $< |
| + $(P_TO_D) |
| |
| -litecoind: $(OBJS:obj/%=obj/%) |
| +litecoind: $(OBJS) |
| $(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS) |
| |
| -TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) |
| - |
| obj-test/%.o: test/%.cpp |
| $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $< |
| - @cp $(@:%.o=%.d) $(@:%.o=%.P); \ |
| - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ |
| - -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ |
| - rm -f $(@:%.o=%.d) |
| + $(P_TO_D) |
| + |
| +obj-test/leveldb.o: leveldb.cpp |
| + $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $< |
| + $(P_TO_D) |
| + |
| +TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) |
| |
| -test_litecoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) |
| +test_litecoin: $(TESTOBJS) |
| $(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ $(TESTLIBS) $(xLDFLAGS) $(LIBS) |
| |
| clean: |