BTCPrivate
/
BitcoinPrivate-legacy
mirror of https://github.com/BTCPrivate/BitcoinPrivate-legacy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add --disable-proton flag to build.sh. Proton has build/linker issues with gcc 4.9.2 and requires gcc 5.x.

This commit is contained in:
Simon 2017-03-25 09:03:22 -07:00
parent 99eb947a98
commit f493d3e044
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
depends/Makefile
View File

@ -75,8 +75,9 @@ include packages/packages.mk
rust_packages_$(NO_RUST) = $(rust_packages) rust_packages_$(NO_RUST) = $(rust_packages)
wallet_packages_$(NO_WALLET) = $(wallet_packages) wallet_packages_$(NO_WALLET) = $(wallet_packages)
upnp_packages_$(NO_UPNP) = $(upnp_packages) upnp_packages_$(NO_UPNP) = $(upnp_packages)
proton_packages_$(NO_PROTON) = $(proton_packages)
packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(rust_packages_) $(wallet_packages_) $(upnp_packages_) packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(rust_packages_) $(proton_packages_) $(wallet_packages_) $(upnp_packages_)
native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages) native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages)
all_packages = $(packages) $(native_packages) all_packages = $(packages) $(native_packages)

3
depends/packages/packages.mk
View File

@ -1,6 +1,7 @@
rust_packages := rust librustzcash rust_packages := rust librustzcash
proton_packages := proton
zcash_packages := libsnark libgmp libsodium zcash_packages := libsnark libgmp libsodium
packages := boost openssl libevent zeromq $(zcash_packages) googletest googlemock proton packages := boost openssl libevent zeromq $(zcash_packages) googletest googlemock
native_packages := native_ccache native_packages := native_ccache
wallet_packages=bdb wallet_packages=bdb

18
zcutil/build.sh
View File

@ -33,7 +33,7 @@ Usage:
$0 --help $0 --help
Show this help message and exit. Show this help message and exit.
$0 [ --enable-lcov || --disable-tests ] [ --disable-mining ] [ --disable-rust ] [ MAKEARGS... ] $0 [ --enable-lcov || --disable-tests ] [ --disable-mining ] [ --disable-rust ] [ --disable-proton ] [ MAKEARGS... ]
Build Zcash and most of its transitive dependencies from Build Zcash and most of its transitive dependencies from
source. MAKEARGS are applied to both dependencies and Zcash itself. source. MAKEARGS are applied to both dependencies and Zcash itself.
@ -46,6 +46,10 @@ $0 [ --enable-lcov || --disable-tests ] [ --disable-mining ] [ --disable-rust ]
If --disable-rust is passed, Zcash is configured to not build any Rust language If --disable-rust is passed, Zcash is configured to not build any Rust language
assets. It must be passed after mining/test arguments, if present. assets. It must be passed after mining/test arguments, if present.
If --disable-proton is passed, Zcash is configured to not build the Apache
Qpid Proton library required for AMQP support. It must be passed after the
test arguments, if present.
EOF EOF
exit 0 exit 0
fi fi
@ -84,9 +88,17 @@ then
shift shift
fi fi
# If --disable-proton is the next argument, disable building Proton code:
PROTON_ARG=''
if [ "x${1:-}" = 'x--disable-proton' ]
then
PROTON_ARG='--enable-proton=no'
shift
fi
PREFIX="$(pwd)/depends/$BUILD/" PREFIX="$(pwd)/depends/$BUILD/"
HOST="$HOST" BUILD="$BUILD" NO_RUST="$RUST_ARG" "$MAKE" "$@" -C ./depends/ V=1 HOST="$HOST" BUILD="$BUILD" NO_RUST="$RUST_ARG" NO_PROTON="$PROTON_ARG" "$MAKE" "$@" -C ./depends/ V=1
./autogen.sh ./autogen.sh
CC="$CC" CXX="$CXX" ./configure --prefix="${PREFIX}" --host="$HOST" --build="$BUILD" "$RUST_ARG" "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" CXXFLAGS='-fwrapv -fno-strict-aliasing -Werror -g' CC="$CC" CXX="$CXX" ./configure --prefix="${PREFIX}" --host="$HOST" --build="$BUILD" "$RUST_ARG" "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" "$PROTON_ARG" CXXFLAGS='-fwrapv -fno-strict-aliasing -Werror -g'
"$MAKE" "$@" V=1 "$MAKE" "$@" V=1