From 16517561115179d392e2397e0c72a91c5128e715 Mon Sep 17 00:00:00 2001 From: Patrick Lewis Date: Wed, 22 Dec 2021 10:55:04 -0800 Subject: fix: macos pin openssl to 1.1 (#666) * fix: macos pin openssl to 1.1 * fix: make sure cmake uses openssl@1.1 --- docs/macos-core-installation.md | 7 ++++--- docs/macos-requirements.md | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/macos-core-installation.md b/docs/macos-core-installation.md index dd5ea5a..2530cc9 100644 --- a/docs/macos-core-installation.md +++ b/docs/macos-core-installation.md @@ -59,6 +59,7 @@ At this point, you must be in your "build/" directory. **Note**: in the follows command the variable `$HOME` is the path of the **current user**, so if you are logged as root, $HOME will be "/root". ```sh +export OPENSSL_ROOT_DIR=$(brew --prefix openssl@1.1) cmake ../ \ -DCMAKE_INSTALL_PREFIX=$HOME/azeroth-server/ \ -DTOOLS=0 \ @@ -67,9 +68,9 @@ cmake ../ \ -DMYSQL_LIBRARY=/usr/local/lib/libmysqlclient.dylib \ -DREADLINE_INCLUDE_DIR=/usr/local/opt/readline/include \ -DREADLINE_LIBRARY=/usr/local/opt/readline/lib/libreadline.dylib \ --DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include \ --DOPENSSL_SSL_LIBRARIES=/usr/local/opt/openssl/lib/libssl.dylib \ --DOPENSSL_CRYPTO_LIBRARIES=/usr/local/opt/openssl/lib/libcrypto.dylib +-DOPENSSL_INCLUDE_DIR="$OPENSSL_ROOT_DIR/include" \ +-DOPENSSL_SSL_LIBRARIES="$OPENSSL_ROOT_DIR/lib/libssl.dylib" \ +-DOPENSSL_CRYPTO_LIBRARIES="$OPENSSL_ROOT_DIR/lib/libcrypto.dylib" ``` To know the amount of cores available. diff --git a/docs/macos-requirements.md b/docs/macos-requirements.md index 508ac89..733429b 100644 --- a/docs/macos-requirements.md +++ b/docs/macos-requirements.md @@ -26,7 +26,7 @@ brew update ``` ```sh -brew install openssl readline cmake boost coreutils bash bash-completion coreutils +brew install openssl@1.1 readline cmake boost coreutils bash bash-completion coreutils ``` This will install bash 5+, you might need to restart your terminal. -- cgit