diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-10-26 11:34:25 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-10-26 11:35:45 +0200 |
| commit | d91af4768c1cbc1a6ec0f69a3a6d17f69c0cee07 (patch) | |
| tree | 8e3c746d8ac1f53ac7cf8e4724f5642d3bc52ffb /ci/test/00_setup_env_mac_host.sh | |
| parent | 25d7e2e78137d07eb612c44d19b0d496050c947a (diff) | |
| parent | 8c6081a884cd0969160955ce8687d4d4ed074db3 (diff) | |
| download | bitcoin-d91af4768c1cbc1a6ec0f69a3a6d17f69c0cee07.tar.xz | |
Merge #17165: Remove BIP70 support
8c6081a884cd0969160955ce8687d4d4ed074db3 compat: remove bswap_* check on macOS (fanquake)
2cba35ab38b492768e85bd77442a566dda169466 build: skip building OpenSSL lib_ssl (fanquake)
45a2d3c5526551c279b624e111fe83d1f30b10db build: remove OpenSSL from Qt build (fanquake)
befbc40eb5928ac20a85fd3446946895cd2e66cb build: remove EVP_MD_CTX_new detection (fanquake)
fcee10c2d028cba11416d902f5abf13fea7a65f4 build: remove SSL lib detection (fanquake)
c7f30dbca8034f70488cb494b4d1736c961301b9 gui: Update BIP70 support message (fanquake)
a3e810326d7e70a774ece9e9aa0c571cc9216aab build: remove BIP70 entries from macOS Info.plist (fanquake)
72fe13a58d5894afbaf1bb6789ee9b9b6576f20f gui: remove payment request file handling from OpenURI dialog (fanquake)
3548e4aac72e9148d41b440052a89d89328f7661 Remove BIP70 Support (fanquake)
1cb9a4e28cccd3056e2b8d9cdabc45bf3e4dd2a6 docs: remove protobuf from docs (fanquake)
67328bb7ca57fa0df867ec73dbeeb97d61450a4e build: remove protobuf from depends (fanquake)
Pull request description:
This removes [BIP70](https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki) support. It also removes OpenSSL linking from Qt and building OpenSSLs `lib_ssl` in depends, as well as SSL lib detection from the build system. It's something that I'd optimistically like to do for `0.20.0`.
ACKs for top commit:
laanwj:
Code review ACK 8c6081a884cd0969160955ce8687d4d4ed074db3
MarcoFalke:
ACK 8c6081a884cd0969160955ce8687d4d4ed074db3
fjahr:
ACK 8c6081a
Tree-SHA512: 9dd9153afa4eca1a795f983e5b31f5fee9fa9a064c2a95d2f98810689add3ad0bf221c4608282299e66e4d1ec31cd556d4b16eea55de7912c3b9931f64735883
Diffstat (limited to 'ci/test/00_setup_env_mac_host.sh')
| -rw-r--r-- | ci/test/00_setup_env_mac_host.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/test/00_setup_env_mac_host.sh b/ci/test/00_setup_env_mac_host.sh index 3033f4cdd9..aa68a5700e 100644 --- a/ci/test/00_setup_env_mac_host.sh +++ b/ci/test/00_setup_env_mac_host.sh @@ -7,13 +7,13 @@ export LC_ALL=C.UTF-8 export HOST=x86_64-apple-darwin14 -export BREW_PACKAGES="automake berkeley-db4 libtool boost miniupnpc pkg-config protobuf qt qrencode python3 ccache zeromq" +export BREW_PACKAGES="automake berkeley-db4 libtool boost miniupnpc pkg-config qt qrencode python3 ccache zeromq" export PIP_PACKAGES="zmq" export RUN_CI_ON_HOST=true export RUN_UNIT_TESTS=true export RUN_FUNCTIONAL_TESTS=false export GOAL="install" -export BITCOIN_CONFIG="--enable-gui --enable-bip70 --enable-reduce-exports --enable-werror" +export BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --enable-werror" # Run without depends export NO_DEPENDS=1 export OSX_SDK="" |