From 70b82ae359a5538711e103b0e8dfb92654296644 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 27 Oct 2018 12:48:57 +0100 Subject: gentoo resync : 27.10.2018 --- .../files/bitcoin-qt-0.15.1-test-build-fix.patch | 24 ---------------------- .../files/bitcoin-qt-0.15.1-test-util-fix.patch | 15 -------------- 2 files changed, 39 deletions(-) delete mode 100644 net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-build-fix.patch delete mode 100644 net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-util-fix.patch (limited to 'net-p2p/bitcoin-qt/files') diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-build-fix.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-build-fix.patch deleted file mode 100644 index 3d953d9c0a94..000000000000 --- a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-build-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 91976ef251bbb693db8c4e36b62ceca1f6417413 (HEAD) -Author: Luke Dashjr -Date: Tue Jan 23 03:37:10 2018 +0000 - - Bugfix: script_tests: Only define debugger_cbs if HAVE_CONSENSUS_LIB - -diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp -index 7826cdc1b3..013846811b 100644 ---- a/src/test/script_tests.cpp -+++ b/src/test/script_tests.cpp -@@ -186,11 +186,13 @@ static void script_tests_debugger_ScriptEOF(void *userdata, struct bitcoinconsen - ++data->eof; - } - -+#if defined(HAVE_CONSENSUS_LIB) - static const struct bitcoinconsensus_script_debugger_callbacks debugger_cbs = { - .ScriptBegin = script_tests_debugger_ScriptBegin, - .ScriptPreStep = script_tests_debugger_ScriptPreStep, - .ScriptEOF = script_tests_debugger_ScriptEOF, - }; -+#endif - - void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, const CScriptWitness& scriptWitness, int flags, const std::string& message, int scriptError, CAmount nValue = 0) - { diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-util-fix.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-util-fix.patch deleted file mode 100644 index 60fc9d849054..000000000000 --- a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-util-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/Makefile.test.include b/src/Makefile.test.include -index 147add3eb5..308b1c88c0 100644 ---- a/src/Makefile.test.include -+++ b/src/Makefile.test.include -@@ -151,8 +151,10 @@ bitcoin_test_clean : FORCE - rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY) - - check-local: -+if BUILD_BITCOIN_TX - @echo "Running test/util/bitcoin-util-test.py..." - $(PYTHON) $(top_builddir)/test/util/bitcoin-util-test.py -+endif - if EMBEDDED_LIBSECP256K1 - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check - endif -- cgit v1.2.3