diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2013-08-03 16:25:04 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2013-08-03 16:25:04 +0000 |
| commit | c4faf5648b1192059538368382c436a76db581f1 (patch) | |
| tree | 4bd38d1b24f0b425dd08f8f88d4c082a7151cd0c /net-p2p | |
| parent | Version bumps (diff) | |
| download | gentoo-2-c4faf5648b1192059538368382c436a76db581f1.tar.gz gentoo-2-c4faf5648b1192059538368382c436a76db581f1.tar.bz2 gentoo-2-c4faf5648b1192059538368382c436a76db581f1.zip | |
Fix 0.8.2-sys_leveldb.patch
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'net-p2p')
| -rw-r--r-- | net-p2p/bitcoind/ChangeLog | 6 | ||||
| -rw-r--r-- | net-p2p/bitcoind/files/0.8.2-sys_leveldb.patch | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/net-p2p/bitcoind/ChangeLog b/net-p2p/bitcoind/ChangeLog index ecbbcdaf20ae..7c862a6b7ebe 100644 --- a/net-p2p/bitcoind/ChangeLog +++ b/net-p2p/bitcoind/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-p2p/bitcoind # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/ChangeLog,v 1.68 2013/07/27 07:26:40 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/ChangeLog,v 1.69 2013/08/03 16:25:04 blueness Exp $ + + 03 Aug 2013; Anthony G. Basile <blueness@gentoo.org> + files/0.8.2-sys_leveldb.patch: + Fix 0.8.2-sys_leveldb.patch *bitcoind-0.8.3-r1 (27 Jul 2013) diff --git a/net-p2p/bitcoind/files/0.8.2-sys_leveldb.patch b/net-p2p/bitcoind/files/0.8.2-sys_leveldb.patch index 92f803f4e4f1..2b9ab1a6d67e 100644 --- a/net-p2p/bitcoind/files/0.8.2-sys_leveldb.patch +++ b/net-p2p/bitcoind/files/0.8.2-sys_leveldb.patch @@ -46,15 +46,16 @@ index cf80986..520b5df 100644 # regenerate src/build.h !win32|contains(USE_BUILD_INFO, 1) { diff --git a/src/leveldb.cpp b/src/leveldb.cpp -index b41764f..f71e801 100644 +index b41764f..30c524d 100644 --- a/src/leveldb.cpp +++ b/src/leveldb.cpp @@ -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/memenv.h> ++#include <memenv.h> +#endif #include <boost/filesystem.hpp> @@ -73,7 +74,7 @@ index b41764f..f71e801 100644 if (fWipe) { printf("Wiping LevelDB in %s\n", path.string().c_str()); diff --git a/src/makefile.unix b/src/makefile.unix -index 081edaf..1735b89 100644 +index 081edaf..27f2199 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -104,8 +104,7 @@ xCXXFLAGS=-O2 -pthread -Wall -Wextra -Wformat -Wformat-security -Wno-unused-para @@ -129,7 +130,8 @@ index 081edaf..1735b89 100644 +LIBS += $(CURDIR)/leveldb/libleveldb.a +TESTLIBS += $(CURDIR)/leveldb/libmemenv.a DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) - DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) +-DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) ++DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers/memenv) 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 .. |