From efd77d38a26c0c16aed3599558dc334d0de94b1f Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Fri, 13 Dec 2019 14:55:41 -0500 Subject: [PATCH] Cleanliness is next to godliness. And God is empty, just like me --- Makefile.am.patch | 218 --------------------------------------------- configure.ac.patch | 99 -------------------- equihash.cpp.patch | 35 -------- 3 files changed, 352 deletions(-) delete mode 100644 Makefile.am.patch delete mode 100644 configure.ac.patch delete mode 100644 equihash.cpp.patch diff --git a/Makefile.am.patch b/Makefile.am.patch deleted file mode 100644 index 9a4c12880..000000000 --- a/Makefile.am.patch +++ /dev/null @@ -1,218 +0,0 @@ -*** Makefile.am 2017-01-03 10:53:52.436371005 +0000 ---- ../../komodo-jl777/Makefile.am 2017-01-03 09:49:08.848505929 +0000 -*************** -*** 39,58 **** - $(top_srcdir)/contrib/macdeploy/detached-sig-apply.sh \ - $(top_srcdir)/contrib/macdeploy/detached-sig-create.sh - -- -- if BUILD_DARWIN -- COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \ -- leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \ -- baseline_filtered.info block_test_filtered.info \ -- leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info -- # zcash-gtest.info zcash-gtest_filtered.info zcash-gtest_coverage.info -- else - COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \ - leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \ - baseline_filtered.info block_test_filtered.info \ - leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info \ - zcash-gtest.info zcash-gtest_filtered.info zcash-gtest_coverage.info -- endif - - dist-hook: - -$(MAKE) -C $(top_distdir)/src/leveldb clean ---- 39,49 ---- -*************** -*** 159,173 **** - baseline.info: - $(LCOV) -c -i -d $(abs_builddir)/src -o $@ - -- if BUILD_DARWIN -- baseline_filtered.info: baseline.info -- $(LCOV) -r $< "/usr/include/*" \ -- "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \ -- "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \ -- "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \ -- "$(abs_builddir)/src/test/*" \ -- -o $@ -- else - baseline_filtered.info: baseline.info - $(LCOV) -r $< "/usr/include/*" \ - "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \ ---- 150,155 ---- -*************** -*** 177,196 **** - "$(abs_builddir)/src/gtest/*" \ - "$(abs_builddir)/src/test/*" \ - -o $@ -- endif - - leveldb_baseline.info: baseline_filtered.info - $(LCOV) -c -i -d $(abs_builddir)/src/leveldb -b $(abs_builddir)/src/leveldb -o $@ - -- if BUILD_DARWIN -- leveldb_baseline_filtered.info: leveldb_baseline.info -- $(LCOV) -r $< "/usr/include/*" \ -- "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \ -- "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \ -- "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \ -- "$(abs_builddir)/src/test/*" \ -- -o $@ -- else - leveldb_baseline_filtered.info: leveldb_baseline.info - $(LCOV) -r $< "/usr/include/*" \ - "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \ ---- 159,168 ---- -*************** -*** 200,206 **** - "$(abs_builddir)/src/gtest/*" \ - "$(abs_builddir)/src/test/*" \ - -o $@ -- endif - - baseline_filtered_combined.info: leveldb_baseline_filtered.info baseline_filtered.info - $(LCOV) -a leveldb_baseline_filtered.info -a baseline_filtered.info -o $@ ---- 172,177 ---- -*************** -*** 211,226 **** - $(LCOV) -z -d $(abs_builddir)/src - $(LCOV) -z -d $(abs_builddir)/src/leveldb - -- if BUILD_DARWIN - test_bitcoin_filtered.info: test_bitcoin.info - $(LCOV) -r $< "/usr/include/*" \ - "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \ - "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \ - "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \ - "$(abs_builddir)/src/test/*" \ - -o $@ -! else -! test_bitcoin_filtered.info: test_bitcoin.info - $(LCOV) -r $< "/usr/include/*" \ - "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \ - "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \ ---- 182,204 ---- - $(LCOV) -z -d $(abs_builddir)/src - $(LCOV) -z -d $(abs_builddir)/src/leveldb - - test_bitcoin_filtered.info: test_bitcoin.info - $(LCOV) -r $< "/usr/include/*" \ - "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \ - "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \ - "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \ -+ "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \ -+ "$(abs_builddir)/src/gtest/*" \ - "$(abs_builddir)/src/test/*" \ - -o $@ -! -! zcash-gtest.info: baseline_filtered_combined.info -! $(MAKE) -C src/ zcash-gtest_check -! $(LCOV) -c -d $(abs_builddir)/src -t zcash-gtest -o $@ -! $(LCOV) -z -d $(abs_builddir)/src -! $(LCOV) -z -d $(abs_builddir)/src/leveldb -! -! zcash-gtest_filtered.info: zcash-gtest.info - $(LCOV) -r $< "/usr/include/*" \ - "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \ - "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \ -*************** -*** 229,235 **** - "$(abs_builddir)/src/gtest/*" \ - "$(abs_builddir)/src/test/*" \ - -o $@ -- endif - - block_test.info: test_bitcoin_filtered.info - $(MKDIR_P) qa/tmp ---- 207,212 ---- -*************** -*** 238,252 **** - $(LCOV) -z -d $(abs_builddir)/src - $(LCOV) -z -d $(abs_builddir)/src/leveldb - -- if BUILD_DARWIN -- block_test_filtered.info: block_test.info -- $(LCOV) -r $< "/usr/include/*" \ -- "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \ -- "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \ -- "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \ -- "$(abs_builddir)/src/test/*" \ -- -o $@ -- else - block_test_filtered.info: block_test.info - $(LCOV) -r $< "/usr/include/*" \ - "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \ ---- 215,220 ---- -*************** -*** 256,293 **** - "$(abs_builddir)/src/gtest/*" \ - "$(abs_builddir)/src/test/*" \ - -o $@ -- endif - - test_bitcoin_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info -! $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -o $@ - -- if ! BUILD_DARWIN - zcash-gtest_coverage.info: baseline_filtered_combined.info zcash-gtest_filtered.info - $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a zcash-gtest_filtered.info -o $@ -- endif - -- if BUILD_DARWIN -- total_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info block_test_filtered.info -- $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt -- else - total_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info zcash-gtest_filtered.info block_test_filtered.info - $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a zcash-gtest_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt -- endif -- - - test_bitcoin.coverage/.dirstamp: test_bitcoin_coverage.info -! $(GENHTML) -s $< -o $(@D) -! @touch $@ - - total.coverage/.dirstamp: total_coverage.info -! $(GENHTML) -s $< -o $(@D) -! @touch $@ - -- if BUILD_DARWIN -- cov: test_bitcoin.coverage/.dirstamp total.coverage/.dirstamp -- else - cov: test_bitcoin.coverage/.dirstamp cov-zcash total.coverage/.dirstamp -- endif - - endif - ---- 224,254 ---- - "$(abs_builddir)/src/gtest/*" \ - "$(abs_builddir)/src/test/*" \ - -o $@ - - test_bitcoin_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info -! $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -o $@ - - zcash-gtest_coverage.info: baseline_filtered_combined.info zcash-gtest_filtered.info - $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a zcash-gtest_filtered.info -o $@ - - total_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info zcash-gtest_filtered.info block_test_filtered.info - $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a zcash-gtest_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt - - test_bitcoin.coverage/.dirstamp: test_bitcoin_coverage.info -! $(GENHTML) -s $< -o $(@D) -! @touch $@ -! -! zcash-gtest.coverage/.dirstamp: zcash-gtest_coverage.info -! $(GENHTML) -s $< -o $(@D) -! @touch $@ -! -! cov-zcash: zcash-gtest.coverage/.dirstamp - - total.coverage/.dirstamp: total_coverage.info -! $(GENHTML) -s $< -o $(@D) -! @touch $@ - - cov: test_bitcoin.coverage/.dirstamp cov-zcash total.coverage/.dirstamp - - endif - diff --git a/configure.ac.patch b/configure.ac.patch deleted file mode 100644 index f3687e04e..000000000 --- a/configure.ac.patch +++ /dev/null @@ -1,99 +0,0 @@ -*** configure.ac 2017-01-03 10:53:52.436371005 +0000 ---- ../../komodo-jl777/configure.ac 2017-01-03 09:49:08.848505929 +0000 -*************** -*** 124,130 **** - [AS_HELP_STRING([--enable-hardening], - [attempt to harden the resulting executables (default is yes)])], - [use_hardening=$enableval], -! [use_hardening=no]) - - AC_ARG_ENABLE([reduce-exports], - [AS_HELP_STRING([--enable-reduce-exports], ---- 124,130 ---- - [AS_HELP_STRING([--enable-hardening], - [attempt to harden the resulting executables (default is yes)])], - [use_hardening=$enableval], -! [use_hardening=yes]) - - AC_ARG_ENABLE([reduce-exports], - [AS_HELP_STRING([--enable-reduce-exports], -*************** -*** 276,305 **** - fi - fi - -! dnl AC_CHECK_PROG([BREW],brew, brew) -! dnl if test x$BREW = xbrew; then - dnl These Homebrew packages may be keg-only, meaning that they won't be found - dnl in expected paths because they may conflict with system files. Ask - dnl Homebrew where each one is located, then adjust paths accordingly. - dnl It's safe to add these paths even if the functionality is disabled by - dnl the user (--without-wallet or --without-gui for example). - -! dnl openssl_prefix=`$BREW --prefix openssl 2>/dev/null` -! dnl bdb_prefix=`$BREW --prefix berkeley-db4 2>/dev/null` -! dnl qt5_prefix=`$BREW --prefix qt5 2>/dev/null` -! dnl if test x$openssl_prefix != x; then -! dnl PKG_CONFIG_PATH="$PKG_CONFIG_PATH" -! dnl export PKG_CONFIG_PATH -! dnl fi -! dnl if test x$bdb_prefix != x; then -! dnl CPPFLAGS="$CPPFLAGS -I$bdb_prefix/include" -! dnl LIBS="$LIBS -L$bdb_prefix/lib" -! dnl fi -! dnl if test x$qt5_prefix != x; then -! dnl PKG_CONFIG_PATH="$qt5_prefix/lib/pkgconfig:$PKG_CONFIG_PATH" -! dnl export PKG_CONFIG_PATH -! dnl fi -! dnl fi - else - case $build_os in - *darwin*) ---- 276,305 ---- - fi - fi - -! AC_CHECK_PROG([BREW],brew, brew) -! if test x$BREW = xbrew; then - dnl These Homebrew packages may be keg-only, meaning that they won't be found - dnl in expected paths because they may conflict with system files. Ask - dnl Homebrew where each one is located, then adjust paths accordingly. - dnl It's safe to add these paths even if the functionality is disabled by - dnl the user (--without-wallet or --without-gui for example). - -! openssl_prefix=`$BREW --prefix openssl 2>/dev/null` -! bdb_prefix=`$BREW --prefix berkeley-db4 2>/dev/null` -! qt5_prefix=`$BREW --prefix qt5 2>/dev/null` -! if test x$openssl_prefix != x; then -! PKG_CONFIG_PATH="$openssl_prefix/lib/pkgconfig:$PKG_CONFIG_PATH" -! export PKG_CONFIG_PATH -! fi -! if test x$bdb_prefix != x; then -! CPPFLAGS="$CPPFLAGS -I$bdb_prefix/include" -! LIBS="$LIBS -L$bdb_prefix/lib" -! fi -! if test x$qt5_prefix != x; then -! PKG_CONFIG_PATH="$qt5_prefix/lib/pkgconfig:$PKG_CONFIG_PATH" -! export PKG_CONFIG_PATH -! fi -! fi - else - case $build_os in - *darwin*) -*************** -*** 730,736 **** - AC_CHECK_HEADER([libsnark/gadgetlib1/gadget.hpp],,AC_MSG_ERROR(libsnark headers missing)) - AC_CHECK_LIB([snark],[main],LIBSNARK_LIBS=-lsnark, [AC_MSG_ERROR(libsnark missing)], [-lgmpxx]) - -! LIBZCASH_LIBS="-lsnark -lgmp -lgmpxx -lboost_system-mt -lcrypto -lsodium" - - CXXFLAGS_TEMP="$CXXFLAGS" - LIBS_TEMP="$LIBS" ---- 730,736 ---- - AC_CHECK_HEADER([libsnark/gadgetlib1/gadget.hpp],,AC_MSG_ERROR(libsnark headers missing)) - AC_CHECK_LIB([snark],[main],LIBSNARK_LIBS=-lsnark, [AC_MSG_ERROR(libsnark missing)], [-lgmpxx]) - -! LIBZCASH_LIBS="-lsnark -lgmp -lgmpxx -lboost_system-mt -lcrypto -lsodium -fopenmp" - - CXXFLAGS_TEMP="$CXXFLAGS" - LIBS_TEMP="$LIBS" diff --git a/equihash.cpp.patch b/equihash.cpp.patch deleted file mode 100644 index da44928ad..000000000 --- a/equihash.cpp.patch +++ /dev/null @@ -1,35 +0,0 @@ -*** src/crypto/equihash.cpp 2017-01-03 10:53:52.444371361 +0000 ---- ../../komodo-jl777/src/crypto/equihash.cpp 2017-01-03 09:48:21.690037241 +0000 -*************** -*** 21,50 **** - - #include - -- #ifdef __APPLE__ -- #include -- #include -- -- #define htobe16(x) OSSwapHostToBigInt16(x) -- #define htole16(x) OSSwapHostToLittleInt16(x) -- #define be16toh(x) OSSwapBigToHostInt16(x) -- #define le16toh(x) OSSwapLittleToHostInt16(x) -- -- #define htobe32(x) OSSwapHostToBigInt32(x) -- #define htole32(x) OSSwapHostToLittleInt32(x) -- #define be32toh(x) OSSwapBigToHostInt32(x) -- #define le32toh(x) OSSwapLittleToHostInt32(x) -- -- #define htobe64(x) OSSwapHostToBigInt64(x) -- #define htole64(x) OSSwapHostToLittleInt64(x) -- #define be64toh(x) OSSwapBigToHostInt64(x) -- #define le64toh(x) OSSwapLittleToHostInt64(x) -- -- #define __BIG_ENDIAN BIG_ENDIAN -- #define __LITTLE_ENDIAN LITTLE_ENDIAN -- #define __BYTE_ORDER BYTE_ORDER -- #endif -- - EhSolverCancelledException solver_cancelled; - - template ---- 21,26 ----