diff --git a/contrib/debian/control b/contrib/debian/control --- a/contrib/debian/control +++ b/contrib/debian/control @@ -19,7 +19,6 @@ libprotobuf-dev, libqrencode-dev, libssl-dev, - libsqlite3-dev, libzmq3-dev, lld, ninja-build, diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -79,7 +79,7 @@ echo "REAL=\`which -a ${prog} | grep -v ${WRAP_DIR}/${prog} | head -1\`" >> ${WRAP_DIR}/${prog} echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${prog} echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${prog} - echo "\$REAL \"\$@\"" >> $WRAP_DIR/${prog} + echo "\$REAL \$@" >> $WRAP_DIR/${prog} chmod +x ${WRAP_DIR}/${prog} done } diff --git a/contrib/utils/install-dependencies.sh b/contrib/utils/install-dependencies.sh --- a/contrib/utils/install-dependencies.sh +++ b/contrib/utils/install-dependencies.sh @@ -51,7 +51,6 @@ libqt5dbus5 libqt5gui5 librsvg2-bin - libsqlite3-dev libssl-dev libtiff-tools libtinfo5 diff --git a/depends/Makefile b/depends/Makefile --- a/depends/Makefile +++ b/depends/Makefile @@ -132,10 +132,7 @@ qt_packages_$(NO_QT) = $(qt_packages) $(qt_$(host_os)_packages) $(qt_$(host_arch)_$(host_os)_packages) $(qrencode_packages_) -bdb_packages_$(NO_BDB) = $(bdb_packages) -sqlite_packages_$(NO_SQLITE) = $(sqlite_packages) -wallet_packages_$(NO_WALLET) = $(bdb_packages_) $(sqlite_packages_) - +wallet_packages_$(NO_WALLET) = $(wallet_packages) upnp_packages_$(NO_UPNP) = $(upnp_packages) zmq_packages_$(NO_ZMQ) = $(zmq_packages) diff --git a/depends/README.md b/depends/README.md --- a/depends/README.md +++ b/depends/README.md @@ -97,10 +97,6 @@
Don't download/build/cache packages needed for enabling zeromq
NO_WALLET
Don't download/build/cache libs needed to enable the wallet
-
NO_BDB
-
Don't download/build/cache BerkeleyDB
-
NO_SQLITE
-
Don't download/build/cache SQLite
NO_UPNP
Don't download/build/cache packages needed for enabling upnp
NO_JEMALLOC
diff --git a/depends/packages/packages.mk b/depends/packages/packages.mk --- a/depends/packages/packages.mk +++ b/depends/packages/packages.mk @@ -12,8 +12,7 @@ qt_darwin_packages=qt qt_mingw32_packages=qt -bdb_packages=bdb -sqlite_packages=sqlite +wallet_packages=bdb zmq_packages=zeromq diff --git a/depends/packages/sqlite.mk b/depends/packages/sqlite.mk deleted file mode 100644 --- a/depends/packages/sqlite.mk +++ /dev/null @@ -1,26 +0,0 @@ -package=sqlite -$(package)_version=3320100 -$(package)_download_path=https://sqlite.org/2020/ -$(package)_file_name=sqlite-autoconf-$($(package)_version).tar.gz -$(package)_sha256_hash=486748abfb16abd8af664e3a5f03b228e5f124682b0c942e157644bf6fff7d10 - -define $(package)_set_vars -$(package)_config_opts=--disable-shared --disable-readline --disable-dynamic-extensions --enable-option-checking -$(package)_config_opts_linux=--with-pic -endef - -define $(package)_config_cmds - $($(package)_autoconf) -endef - -define $(package)_build_cmds - $(MAKE) -j$(JOBS) libsqlite3.la -endef - -define $(package)_stage_cmds - $(MAKE) DESTDIR=$($(package)_staging_dir) install-libLTLIBRARIES install-includeHEADERS install-pkgconfigDATA -endef - -define $(package)_postprocess_cmds - rm lib/*.la -endef diff --git a/doc/build-osx.md b/doc/build-osx.md --- a/doc/build-osx.md +++ b/doc/build-osx.md @@ -21,7 +21,7 @@ Install dependencies: - brew install berkeley-db boost cmake jemalloc libevent librsvg miniupnpc ninja openssl protobuf python qrencode qt@5 sqlite zeromq + brew install berkeley-db boost cmake jemalloc libevent librsvg miniupnpc ninja openssl protobuf python qrencode qt@5 zeromq See [dependencies.md](dependencies.md) for a complete overview. diff --git a/doc/build-unix.md b/doc/build-unix.md --- a/doc/build-unix.md +++ b/doc/build-unix.md @@ -38,7 +38,6 @@ ------------|------------------|---------------------- miniupnpc | UPnP Support | Firewall-jumping support libdb | Berkeley DB | Wallet storage (only needed when wallet enabled) - libsqlite3 | SQLite 3 | Wallet storage (only needed when wallet enabled) jemalloc | Memory allocator | Library to enhance the memory allocation and improve performances qt | GUI | GUI toolkit (only needed when GUI enabled) protobuf | Payments in GUI | Data interchange format used for payment protocol (only needed when BIP70 enabled) @@ -104,9 +103,9 @@ sudo apt-get install libboost-all-dev -BerkeleyDB 5.3 or later and SQLite 3.7 or later are required for the wallet. These can be installed with: +BerkeleyDB 5.3 or later is required for the wallet. This can be installed with: - sudo apt-get install libdb-dev libdb++-dev libsqlite3-dev + sudo apt-get install libdb-dev libdb++-dev See the section "Disable-wallet mode" to build Bitcoin ABC without wallet. @@ -159,10 +158,6 @@ sudo dnf install qrencode-devel -SQLite can be installed with: - - sudo dnf install sqlite-devel - Notes ----- The release is built with GCC and then "strip bitcoind" to strip the debug diff --git a/doc/dependencies.md b/doc/dependencies.md --- a/doc/dependencies.md +++ b/doc/dependencies.md @@ -26,7 +26,6 @@ | Python (tests) | | [3.6](https://www.python.org/downloads) | | | | | qrencode | [3.4.4](https://fukuchi.org/works/qrencode) | | No | | | | Qt | [5.9.7](https://download.qt.io/official_releases/qt/) | 5.9.5 | No | | | -| SQLite | [3.32.1](https://sqlite.org/download.html) | 3.7.17 | | | | | XCB | | | | | Yes (Linux only) | | xkbcommon | | | | | Yes (Linux only) | | ZeroMQ | [4.3.1](https://github.com/zeromq/libzmq/releases) | 4.1.5 | No | | | @@ -39,7 +38,7 @@ #### Options passed to `cmake` * MiniUPnPc is not needed with `-DENABLE_UPNP=OFF`. -* Berkeley DB and SQLite are not needed with `-DBUILD_BITCOIN_WALLET=OFF`. +* Berkeley DB is not needed with `-DBUILD_BITCOIN_WALLET=OFF`. * protobuf is not needed with `-DENABLE_BIP70=OFF`. * Qt is not needed with `-DBUILD_BITCOIN_QT=OFF`. * qrencode is not needed with `-DENABLE_QRCODE=OFF`. diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt --- a/src/wallet/CMakeLists.txt +++ b/src/wallet/CMakeLists.txt @@ -5,9 +5,6 @@ # Add Berkeley DB dependency. find_package(BerkeleyDB 5.3 REQUIRED COMPONENTS CXX) -# Add SQLite3 dependency. -find_package(SQLite3 3.7.17 REQUIRED) - # PR15638(https://reviews.bitcoinabc.org/D6000) moved some wallet load # functions to wallet/load.cpp, the others in wallet/init.cpp remain in # the server @@ -35,7 +32,7 @@ # There is a circular dependency between wallet and server, see: # https://github.com/bitcoin/bitcoin/pull/14437#discussion_r226237048 -target_link_libraries(wallet bitcoinconsensus univalue BerkeleyDB::CXX SQLite::SQLite3) +target_link_libraries(wallet bitcoinconsensus univalue BerkeleyDB::CXX) # wallet-tool library add_library(wallet-tool wallettool.cpp)