Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

[Develop] explictly use openssl 1.1 via brew on macos #8245

Merged
merged 3 commits into from
Dec 2, 2019
Merged

[Develop] explictly use openssl 1.1 via brew on macos #8245

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
513c154
explictly use openssl 1.1 via brew on macos
spoonincode Nov 25, 2019
6490d44
need to set brew bottle to [email protected] too
spoonincode Nov 25, 2019
1bd66cf
remove OPENSSL_ROOT_DIR from build script -- not needed
spoonincode Nov 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cicd/platforms/pinned/macos-10.14-pinned.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -eo pipefail
VERSION=1
brew update
brew install git cmake python@2 python libtool libusb graphviz automake wget gmp pkgconfig doxygen openssl jq || :
brew install git cmake python@2 python libtool libusb graphviz automake wget gmp pkgconfig doxygen openssl@1.1 jq || :
# install clang from source
git clone --single-branch --branch release_80 https://git.llvm.org/git/llvm.git clang8
cd clang8
Expand Down
2 changes: 1 addition & 1 deletion .cicd/platforms/unpinned/macos-10.14-unpinned.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -eo pipefail
VERSION=1
brew update
brew install git cmake python@2 python libtool libusb graphviz automake wget gmp pkgconfig doxygen openssl jq boost || :
brew install git cmake python@2 python libtool libusb graphviz automake wget gmp pkgconfig doxygen openssl@1.1 jq boost || :
# install mongoDB
cd ~
curl -OL https://fastdl.mongodb.org/osx/mongodb-osx-ssl-x86_64-3.6.3.tgz
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ set(BUILD_MONGO_DB_PLUGIN FALSE CACHE BOOL "Build mongo database plugin")

# add defaults for openssl
if(APPLE AND UNIX AND "${OPENSSL_ROOT_DIR}" STREQUAL "")
set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl")
set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl@1.1")
endif()

# WASM runtimes to enable. Each runtime in this list will have:
Expand Down
2 changes: 1 addition & 1 deletion scripts/eosio_build_darwin_deps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ python,/usr/local/opt/python3
python@2,/usr/local/opt/python2
doxygen,/usr/local/bin/doxygen
libusb,/usr/local/lib/libusb-1.0.0.dylib
openssl,/usr/local/opt/openssl/lib/libssl.a
openssl@1.1,/usr/local/opt/openssl@1.1/lib/libssl.a
2 changes: 1 addition & 1 deletion scripts/generate_bottle.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ echo "class Eosio < Formula
option :universal

depends_on \"gmp\"
depends_on \"openssl\"
depends_on \"openssl@1.1\"
depends_on \"libusb\"
depends_on :macos => :mojave
depends_on :arch => :intel
Expand Down