git.squeep.com Git - portage-squeep/blob - net-p2p/dogecoind/files/dogecoin-sys_leveldb.patch

   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
   4 @@ -5,7 +5,7 @@
   5  INCLUDEPATH += src src/json src/qt
   6  QT += core gui network
   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
  11  CONFIG += thread
  12
  13 @@ -101,25 +101,30 @@
  14      QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs qtaccessiblewidgets
  15  }
  16
  17 +contains(USE_SYSTEM_LEVELDB, 1) {
  18 +    LIBS += -lleveldb
  19 +} else {
  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
  23  !win32 {
  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
  27  } else {
  28      # make an educated guess about what the ranlib command is called
  29      isEmpty(QMAKE_RANLIB) {
  30          QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib)
  31      }
  32      LIBS += -lshlwapi
  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
  35  }
  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
  40 +}
  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
  44 +
  45
  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
  51 @@ -8,7 +8,9 @@
  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
  57 +#include <memenv.h>
  58 +#endif
  59
  60  #include <boost/filesystem.hpp>
  61
  62 @@ -43,8 +45,12 @@
  63      options = GetOptions(nCacheSize);
  64      options.create_if_missing = true;
  65      if (fMemory) {
  66 +#ifndef LEVELDB_WITHOUT_MEMENV
  67          penv = leveldb::NewMemEnv(leveldb::Env::Default());
  68          options.env = penv;
  69 +#else
  70 +        throw std::runtime_error("CLevelDB(): compiled without memenv support");
  71 +#endif
  72      } else {
  73          if (fWipe) {
  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
  78 @@ -110,8 +110,7 @@
  79  # adds some defaults in front. Unfortunately, LDFLAGS=... $(LDFLAGS) does not work.
  80  xLDFLAGS=$(LDHARDENING) $(LDFLAGS)
  81
  82 -OBJS= \
  83 -    leveldb/libleveldb.a \
  84 +BASEOBJS := \
  85      obj/alert.o \
  86      obj/version.o \
  87      obj/checkpoints.o \
  88 @@ -120,7 +119,6 @@
  89      obj/crypter.o \
  90      obj/key.o \
  91      obj/db.o \
  92 -    obj/init.o \
  93      obj/keystore.o \
  94      obj/main.o \
  95      obj/net.o \
  96 @@ -141,9 +139,17 @@
  97      obj/hash.o \
  98      obj/bloom.o \
  99      obj/noui.o \
 100 -    obj/leveldb.o \
 101      obj/txdb.o
 102
 103 +OBJS := \
 104 +    obj/leveldb.o \
 105 +    obj/init.o \
 106 +    $(BASEOBJS)
 107 +
 108 +TESTOBJS := \
 109 +    obj-test/leveldb.o \
 110 +    $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) \
 111 +    $(BASEOBJS)
 112
 113  ifdef USE_SSE2
 114  DEFS += -DUSE_SSE2
 115 @@ -156,15 +162,25 @@
 116  test check: test_dogecoin FORCE
 117         ./test_dogecoin
 118
 119 +ifdef USE_SYSTEM_LEVELDB
 120 +    LIBS += -lleveldb
 121 +    TESTLIBS += -lmemenv
 122 +else
 123  #
 124  # LevelDB support
 125  #
 126  MAKEOVERRIDES =
 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
 139 +endif
 140
 141  # auto-generated dependencies:
 142  -include obj/*.P
 143 @@ -175,33 +191,34 @@
 144  version.cpp: obj/build.h
 145  DEFS += -DHAVE_BUILD_INFO
 146
 147 -obj/%-sse2.o: %-sse2.cpp
 148 -       $(CXX) -c $(xCXXFLAGS) -msse2 -MMD -MF $(@:%.o=%.d) -o $@ $<
 149 +P_TO_D = \
 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); \
 154           rm -f $(@:%.o=%.d)
 155
 156 +obj/%-sse2.o: %-sse2.cpp
 157 +       $(CXX) -c $(xCXXFLAGS) -msse2 -MMD -MF $(@:%.o=%.d) -o $@ $<
 158 +       $(P_TO_D)
 159 +
 160  obj/%.o: %.cpp
 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); \
 165 -         rm -f $(@:%.o=%.d)
 166 +       $(CXX) -c $(xCXXFLAGS) -DLEVELDB_WITHOUT_MEMENV -MMD -MF $(@:%.o=%.d) -o $@ $<
 167 +       $(P_TO_D)
 168
 169 -dogecoind: $(OBJS:obj/%=obj/%)
 170 +dogecoind: $(OBJS)
 171         $(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS)
 172
 173 -TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
 174 -
 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); \
 180 -         rm -f $(@:%.o=%.d)
 181 +       $(P_TO_D)
 182 +
 183 +obj-test/leveldb.o: leveldb.cpp
 184 +       $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
 185 +       $(P_TO_D)
 186 +
 187 +TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
 188
 189 -test_dogecoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
 190 +test_dogecoin: $(TESTOBJS)
 191         $(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ $(TESTLIBS) $(xLDFLAGS) $(LIBS)
 192
 193  clean: