dev-util/bitcoin-tx-22.0: Fix build without LevelDB

Closes: https://bugs.gentoo.org/829412 Signed-off-by: Luke Dashjr <[email protected]> Closes: gentoo#23410 Signed-off-by: Florian Schmaus <[email protected]>
johu · Dec 19, 2021 · f4e315a · f4e315a
1 parent c541980
commit f4e315a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-22.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-22.0.ebuild
@@ -61,6 +61,7 @@ src_prepare() {
 	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
 
 	eapply "${knots_patchdir}/${KNOTS_P}_p1-syslibs.patch"
+	eapply "${FILESDIR}/${PV}-fix_build_without_leveldb.patch"
 
 	if use knots; then
 		eapply "${knots_patchdir}/${KNOTS_P}_p2-fixes.patch"

diff --git a/dev-util/bitcoin-tx/files/22.0-fix_build_without_leveldb.patch b/dev-util/bitcoin-tx/files/22.0-fix_build_without_leveldb.patch
@@ -0,0 +1,23 @@
+diff --git a/src/init/common.cpp b/src/init/common.cpp
+index b5b74cda78b..d01e0e73b4a 100644
+--- a/src/init/common.cpp
++++ b/src/init/common.cpp
+@@ -9,7 +9,6 @@
+ #include <clientversion.h>
+ #include <compat/sanity.h>
+ #include <crypto/sha256.h>
+-#include <dbwrapper.h>
+ #include <key.h>
+ #include <logging.h>
+ #include <node/ui_interface.h>
+@@ -41,10 +40,6 @@ void UnsetGlobals()
+
+ bool SanityChecks()
+ {
+-    if (!dbwrapper_SanityCheck()) {
+-        return InitError(Untranslated("Database sanity check failure. Aborting."));
+-    }
+-
+     if (!ECC_InitSanityCheck()) {
+         return InitError(Untranslated("Elliptic curve cryptography sanity check failure. Aborting."));
+     }