From 2ffd7acdf225b86da6cbe3f003f5481906407a8b Mon Sep 17 00:00:00 2001 From: who-biz <37732338+who-biz@users.noreply.github.com> Date: Mon, 22 Jun 2020 13:48:27 -0400 Subject: [PATCH] Upgrade boost to 1.69 in depends build system, revert openssl change --- contrib/depends/packages/boost.mk | 8 ++++---- contrib/depends/packages/openssl.mk | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/contrib/depends/packages/boost.mk b/contrib/depends/packages/boost.mk index 89db5a41..689ad172 100644 --- a/contrib/depends/packages/boost.mk +++ b/contrib/depends/packages/boost.mk @@ -1,8 +1,8 @@ -package=boost -$(package)_version=1_64_0 -$(package)_download_path=https://dl.bintray.com/boostorg/release/1.64.0/source/ +package=boost +$(package)_version=1_68_0 +$(package)_download_path=https://dl.bintray.com/boostorg/release/1.68.0/source/ $(package)_file_name=$(package)_$($(package)_version).tar.bz2 -$(package)_sha256_hash=7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332 +$(package)_sha256_hash=7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7 define $(package)_set_vars $(package)_config_opts_release=variant=release diff --git a/contrib/depends/packages/openssl.mk b/contrib/depends/packages/openssl.mk index c2a6fb2b..349500d2 100644 --- a/contrib/depends/packages/openssl.mk +++ b/contrib/depends/packages/openssl.mk @@ -6,8 +6,9 @@ $(package)_sha256_hash=ae51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3f define $(package)_set_vars $(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)" -$(package)_config_opts=--prefix=$(host_prefix)/ssl --openssldir=$(host_prefix)/ssl +$(package)_config_opts=--prefix=$(host_prefix) --openssldir=/usr/local/ssl $(package)_config_opts+=no-capieng +$(package)_config_opts+=no-engine $(package)_config_opts+=no-dso $(package)_config_opts+=no-dtls1 $(package)_config_opts+=no-ec_nistp_64_gcc_128