Commit Graph

345 Commits

Author SHA1 Message Date
Scott Sadler
92df780015 Merge remote-tracking branch 'james/dev' into cryptoconditions 2018-04-03 14:43:19 -03:00
Scott Sadler
4c121ffdb0 cpp test suite for cryptoconditions integration 2018-04-01 21:18:01 -03:00
Homu
65dedeeae3 Auto merge of #3131 - str4d:3096-cargo-checksum-fixes, r=daira
depends: Fix regex bugs in cargo-checksum.sh
2018-04-01 05:54:41 -07:00
Homu
1a9caa6ac1 Auto merge of #3127 - str4d:2688-mandatory-rust, r=ebfull
Make Rust compilation mandatory

The temporary integration check in CheckEquihashSolution() remains, until we
have "real" Rust code to integrate.

Closes #2688.
2018-03-30 12:58:34 -07:00
Jack Grigg
0e400c8854 depends: Fix regex bugs in cargo-checksum.sh 2018-03-30 19:06:51 +01:00
Simon
09bf7d2d3c Upgrade OpenSSL to 1.1.0h 2018-03-29 23:05:17 -07:00
Jack Grigg
d9cd254e5e Make Rust compilation mandatory
The temporary integration check in CheckEquihashSolution() remains, until we
have "real" Rust code to integrate.

Closes #2688.
2018-03-28 17:55:45 +02:00
Homu
058efdbe0f Auto merge of #3124 - bitcartel:update_boost_url, r=str4d
Update boost package URL to match official download url on boost.org

Part of #3123.
2018-03-28 08:26:39 -07:00
Homu
a08ad2b815 Auto merge of #3096 - str4d:2231-depends-vendor-rust-crates, r=str4d
depends: Explicitly download and vendor Rust dependencies

Closes #2231.
2018-03-28 07:01:39 -07:00
Jack Grigg
0adfdc99b2 depends: Explicitly download and vendor Rust dependencies
Closes #2231.
2018-03-28 15:46:51 +02:00
Homu
2c91e3ebc0 Auto merge of #3117 - charlieok:add_windows_rust_package, r=daira
Add filename and SHA256 hash for Windows Rust package

When running `make download` in the `depends` directory, the `download-win` target (which `download` depends on) generates an error when it runs the commands defined in `check_or_remove_sources`:

```Makefile
sha256sum: /home/vagrant/zcash/depends/work/download/rust-1.16.0/..hash: no properly formatted SHA256 checksum lines found
funcs.mk:242: recipe for target '/home/vagrant/gitian-builder/cache/common/download-stamps/.stamp_fetched-rust-.hash' failed
make[1]: *** [/home/vagrant/gitian-builder/cache/common/download-stamps/.stamp_fetched-rust-.hash] Error 1
make[1]: Leaving directory '/home/vagrant/zcash/depends'
Makefile:153: recipe for target 'download-win' failed
make: *** [download-win] Error 2
```

The reason for the error is that `depends/packages/rust.mk` defines `rust_file_name_linux` and `rust_file_name_darwin` but leaves `rust_file_name_mingw32` undefined.

A directory of available rust downloads is here: https://static.rust-lang.org/dist/index.html

The closest windows analog in that list (using the same version number as currently defined in `rust.mk`) appears to be `rust-mingw-1.16.0-x86_64-pc-windows-gnu.tar.gz`. A corresponding sha256 value is also given in `rust-mingw-1.16.0-x86_64-pc-windows-gnu.tar.gz.sha256`.

After adding these values to `rust.mk`, the rust-mingw tar package was downloaded along with the rest of the dependencies and the above error message went away.
2018-03-28 05:31:43 -07:00
jl777
1d5c7ffa29 -googlemock 2018-03-28 14:22:39 +03:00
Simon
2b0783792b Update boost package URL to match official download url on boost.org 2018-03-27 09:39:06 -07:00
jl777
079de2e5e8 Test 2018-03-27 16:49:00 +03:00
jl777
919fa9f9c3 Add back googlemk 2018-03-27 16:39:18 +03:00
jl777
1328d71427 Remove / from bintray path 2018-03-27 14:22:06 +03:00
Charlie O'Keefe
de2c5e9be9 Add filename and sha256 hash for windows rust package 2018-03-26 14:52:58 -06:00
Jack Grigg
1c4a74d40b depends: Remove -mt suffix from Boost libraries
Requires disabling --build-type=complete, because in Boost 1.66 it appears to be
broken (only the tagged libraries are built).
2018-03-26 16:33:27 +02:00
Jack Grigg
e6a34c283a Revert "remove -mt suffix from boost libraries built by depends"
This reverts commit 33ae5edd2c.
2018-03-26 16:20:55 +02:00
jl777
e9fac08611 Test 2018-03-25 19:48:21 +03:00
jl777
b380fd6321 Test 2018-03-25 19:27:12 +03:00
jl777
995fee09af Test 2018-03-25 19:14:36 +03:00
jl777
b49b22afd0 Test 2018-03-25 19:08:42 +03:00
jl777
9000990c30 Merge remote-tracking branch 'zcash/master' into rebase2
# Conflicts:
#	.travis.yml
#	Makefile.am
#	README.md
#	configure.ac
#	depends/Makefile
#	depends/builders/darwin.mk
#	depends/funcs.mk
#	depends/hosts/darwin.mk
#	depends/packages/googlemock.mk
#	depends/packages/googletest.mk
#	depends/packages/libsnark.mk
#	depends/packages/libsodium.mk
#	depends/packages/packages.mk
#	depends/packages/rust.mk
#	src/Makefile.am
#	src/Makefile.gtest.include
#	src/chainparams.cpp
#	src/chainparams.h
#	src/checkpoints.h
#	src/clientversion.h
#	src/coins.cpp
#	src/consensus/consensus.h
#	src/gtest/test_mempool.cpp
#	src/httprpc.cpp
#	src/init.cpp
#	src/komodo-tx.cpp
#	src/main.cpp
#	src/miner.cpp
#	src/policy/fees.cpp
#	src/policy/fees.h
#	src/rpcmining.cpp
#	src/rpcrawtransaction.cpp
#	src/rpcserver.cpp
#	src/test/policyestimator_tests.cpp
#	src/test/rpc_wallet_tests.cpp
#	src/test/transaction_tests.cpp
#	src/txdb.cpp
#	src/txmempool.cpp
#	src/wallet/asyncrpcoperation_sendmany.cpp
#	src/wallet/rpcwallet.cpp
#	src/wallet/wallet.cpp
#	src/wallet/wallet.h
#	src/zcash/CreateJoinSplit.cpp
#	zcutil/build.sh
2018-03-25 18:44:38 +03:00
Simon
bbcdabc28d Update boost to 1.66.0 2018-03-23 15:07:17 -07:00
rofl0r
33ae5edd2c remove -mt suffix from boost libraries built by depends 2018-02-23 15:52:55 +00:00
Homu
c720d15c45 Auto merge of #2700 - kozyilmaz:emptyspaces, r=str4d
PATH variable containing spaces cause build failure

Spaces in PATH variable is creating build issues (observed on macOS). For example "VMware Fusion" adds itself to PATH like `/Applications/VMware Fusion.app/Contents/Public`.
2017-12-15 11:35:05 -08:00
Wladimir J. van der Laan
57ab896ba4 test: Remove java comparison tool 2017-12-01 14:10:16 +00:00
daniel
0b2a64f484 add powerpc build support for openssl lib 2017-12-01 14:10:15 +00:00
Jack Grigg
9635679cba Replace "install -D" with "mkdir -p && install" 2017-11-29 17:26:47 +00:00
fanquake
e2e7ca3054 [depends] Set OSX_MIN_VERSION to 10.8 2017-11-29 17:24:59 +00:00
Cory Fields
68ce87eddc depends: bump OSX toolchain
clang: 3.7.1
cctools: 877.8
ld64: 253.9
2017-11-29 17:24:59 +00:00
fanquake
377092a152 [depends] Add -stdlib=libc++ to darwin CXX flags 2017-11-29 17:24:59 +00:00
Cory Fields
038a858d2f depends: use c++11 2017-11-29 17:24:59 +00:00
MarcoFalke
b0a7ddb0b1 [depends] builders: No need to set -L and --location for curl 2017-11-29 17:24:59 +00:00
Luke Dashjr
a8982ac97d Bugfix: depends/Travis: Use --location (follow redirects) and --fail [on HTTP error response] with curl 2017-11-29 17:24:59 +00:00
Luke Dashjr
bd03cfebec depends: Use curl for fetching on Linux
Currently Travis's wget fails fetching qrencode:

Fetching qrencode...
ERROR: no certificate subject alternative name matches
	requested host name `fukuchi.org'.
To connect to fukuchi.org insecurely, use `--no-check-certificate'.
OpenSSL: error:14077438:SSL routines:SSL23_GET_SERVER_HELLO:tlsv1 alert internal error
Unable to establish SSL connection.
make: *** [/home/travis/build/luke-jr/bitcoin/depends/sources/download-stamps/.stamp_fetched-qrencode-qrencode-3.4.4.tar.bz2.hash] Error 4
2017-11-29 17:24:59 +00:00
Cory Fields
1f623c64b6 c++11: fix libbdb build against libc++ in c++11 mode
atomic_init clashes with
2017-11-29 17:24:59 +00:00
Homu
099bf3dd8f Auto merge of #2763 - syd0:upgrade-libsodium, r=daira
Update libsodium from 1.0.11 to 1.0.15

Closes #2693.
2017-11-28 13:20:13 -08:00
syd
0c177bc585 Update libsodium from 1.0.11 to 1.0.15 2017-11-22 23:16:51 -05:00
syd
24902602f2 Upgrade googletest to 1.8.0 2017-11-19 14:08:17 -05:00
kozyilmaz
35e12d992a empty spaces in PATH variable cause build failure 2017-10-31 15:14:21 +03:00
ca333
3c3668af5e 333 2017-10-24 05:27:21 +02:00
ca333
a2d7c036e0 darwin 333 2017-10-22 04:08:53 +02:00
ca333
db402e48fc linux build os detection 2017-10-15 23:51:22 +02:00
ca333
0cdbdd6a73 333 2017-10-09 13:23:12 +02:00
ca333
9d36579649 uni3 2017-10-09 11:45:49 +02:00
ca333
b206e182a7 checksum fix 2017-09-18 23:01:12 +02:00
Sean Bowe
26a8f68ea8 Remove libsnark from depends system and integrate it into build system. 2017-08-02 15:49:30 +01:00
Daira Hopwood
506a21850a Remove UPnP support. fixes #2500
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-07-03 08:57:05 +01:00