From 5d342bfd8fac96ed81a5cc792cffdf742b78d18d Mon Sep 17 00:00:00 2001 From: Jon Layton Date: Sun, 14 Oct 2018 20:48:13 -0500 Subject: [PATCH] Remove pow/tromp/* for Travis err 'No rule to make target 'pow/tromp/equi_miner.h'' --- README.md | 5 +++++ scripts/build-mac.sh | 4 ++-- scripts/build.sh | 4 ++-- src/Makefile.am | 12 ------------ 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 4fe6d1efd..fd9377824 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,11 @@ Build Instructions ------- #### Linux (>= Ubuntu 16.04): + +``` +sudo apt-get install build-essential libtool autotools-dev automake pkg-config libssl-dev libevent-dev bsdmainutils python3 libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev +``` + ``` cd scripts ./build.sh diff --git a/scripts/build-mac.sh b/scripts/build-mac.sh index 14fc52545..550d13749 100755 --- a/scripts/build-mac.sh +++ b/scripts/build-mac.sh @@ -19,13 +19,13 @@ gprefix READLINK readlink cd "$(dirname "$("$READLINK" -f "$0")")/.." # Allow user overrides to $MAKE. Typical usage for users who need it: -# MAKE=gmake ./zcutil/build.sh -j$(nproc) +# MAKE=gmake ./scripts/build.sh -j$(nproc) if [[ -z "${MAKE-}" ]]; then MAKE=make fi # Allow overrides to $BUILD and $HOST for porters. Most users will not need it. -# BUILD=i686-pc-linux-gnu ./zcutil/build.sh +# BUILD=i686-pc-linux-gnu ./scripts/build.sh if [[ -z "${BUILD-}" ]]; then BUILD="$(./depends/config.guess)" fi diff --git a/scripts/build.sh b/scripts/build.sh index 432b7a15b..c0d25d04a 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -19,13 +19,13 @@ gprefix READLINK readlink cd "$(dirname "$("$READLINK" -f "$0")")/.." # Allow user overrides to $MAKE. Typical usage for users who need it: -# MAKE=gmake ./zcutil/build.sh -j$(nproc) +# MAKE=gmake ./scripts/build.sh -j$(nproc) if [[ -z "${MAKE-}" ]]; then MAKE=make fi # Allow overrides to $BUILD and $HOST for porters. Most users will not need it. -# BUILD=i686-pc-linux-gnu ./zcutil/build.sh +# BUILD=i686-pc-linux-gnu ./scripts/build.sh if [[ -z "${BUILD-}" ]]; then BUILD="$(./depends/config.guess)" fi diff --git a/src/Makefile.am b/src/Makefile.am index 9a5aa6223..6fc1dff45 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -334,18 +334,6 @@ if USE_ASM crypto_libbitcoin_crypto_a_SOURCES += crypto/sha256_sse4.cpp endif -if ENABLE_MINING -EQUIHASH_TROMP_SOURCES = \ - pow/tromp/equi_miner.h \ - pow/tromp/equi.h \ - pow/tromp/osx_barrier.h - -crypto_libbitcoin_crypto_a_CPPFLAGS += \ - -DEQUIHASH_TROMP_ATOMIC -crypto_libbitcoin_crypto_a_SOURCES += \ - ${EQUIHASH_TROMP_SOURCES} -endif - # consensus: shared between all executables that validate any consensus rules. libbitcoin_consensus_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) libbitcoin_consensus_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)