Skip to content

Commit

Permalink
Upgrade boost to 1.69 in depends build system, revert openssl change
Browse files Browse the repository at this point in the history
  • Loading branch information
@who-biz
who-biz committed Jun 22, 2020
1 parent f215455 commit 2ffd7ac
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
8 changes: 4 additions & 4 deletions contrib/depends/packages/boost.mk
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion contrib/depends/packages/openssl.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

1 comment on commit 2ffd7ac

@who-biz
Copy link
Contributor Author

@who-biz who-biz commented on 2ffd7ac Jun 22, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correction: commit title should read upgrade to boost 1.68... boost 1.69+ apparently adds an -x64 suffix to compiled libraries , which results in CMake not being able to find them.

OpenSSL has similarly breaking changes in versions above 1.0.2, mostly within build process.

Please sign in to comment.