commit:     f4e315afe367101cc3e5d11dbab1f80ac44f078e
Author:     Luke Dashjr <luke-jr+git <AT> utopios <DOT> org>
AuthorDate: Sat Dec 18 20:25:25 2021 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Dec 19 08:36:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4e315af

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

Closes: https://bugs.gentoo.org/829412
Signed-off-by: Luke Dashjr <luke-jr+git <AT> utopios.org>
Closes: https://github.com/gentoo/gentoo/pull/23410
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-util/bitcoin-tx/bitcoin-tx-22.0.ebuild         |  1 +
 .../files/22.0-fix_build_without_leveldb.patch     | 23 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/dev-util/bitcoin-tx/bitcoin-tx-22.0.ebuild 
b/dev-util/bitcoin-tx/bitcoin-tx-22.0.ebuild
index f09f17d20444..d450673bfec9 100644
--- 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
new file mode 100644
index 000000000000..e9dec14b9d43
--- /dev/null
+++ 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."));
+     }

Reply via email to