From dd603eaa1d12414c06613faba2378e7987aed34a Mon Sep 17 00:00:00 2001 From: Igor Peshansky Date: Tue, 15 May 2018 18:59:43 -0400 Subject: [PATCH 1/4] MacOS: Homebrew no longer links openssl headers and libraries into /usr/local. --- src/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index 12de33be..d0838e98 100644 --- a/src/Makefile +++ b/src/Makefile @@ -31,9 +31,9 @@ SED_EXTRA=-e 's/-Wall/-Wall -Wno-deprecated/' UNAME_S=$(shell uname -s) ifeq ($(UNAME_S),Darwin) - CPPFLAGS+= -I/usr/local/include + CPPFLAGS+= -I/usr/local/include -I/usr/local/opt/openssl/include CXXFLAGS+= -Wno-deprecated-declarations -Wno-c++14-extensions - LDFLAGS+= -L/usr/local/lib + LDFLAGS+= -L/usr/local/lib -L/usr/local/opt/openssl/lib SED_I+= '' SED_EXTRA+= -e \ 's/-Wall/-Wall -Wno-deprecated-declarations -Wno-unused-local-typedef/' From a549ef0816264061de4b2a28b7ea51c6096a63a9 Mon Sep 17 00:00:00 2001 From: Igor Peshansky Date: Thu, 17 May 2018 19:28:37 -0400 Subject: [PATCH 2/4] Add openssl directories to test/Makefile. --- test/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Makefile b/test/Makefile index 645a1754..5129a492 100644 --- a/test/Makefile +++ b/test/Makefile @@ -35,9 +35,9 @@ LDLIBS=\ UNAME_S=$(shell uname -s) ifeq ($(UNAME_S),Darwin) - CPPFLAGS+= -I/usr/local/include + CPPFLAGS+= -I/usr/local/include -I/usr/local/opt/openssl/include CXXFLAGS+= -Wno-deprecated-declarations -Wno-c++14-extensions - LDFLAGS+= -L/usr/local/lib + LDFLAGS+= -L/usr/local/lib -L/usr/local/opt/openssl/lib endif # Where to find code under test. From a8da4caed0b6f379f14a576faf8180ac4f8cacf8 Mon Sep 17 00:00:00 2001 From: Igor Peshansky Date: Thu, 17 May 2018 19:40:21 -0400 Subject: [PATCH 3/4] Mention openssl in the README; restrict to boost 1.60 for now. --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0304e219..46d23535 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,11 @@ This is the Stackdriver metadata agent. 1. Install runtime dependencies: - $ brew install boost -c++11 && \ + *Note: this currently does not works with boost@1.67, which is the latest + available from Homebrew as of 2018/05/17*. + + $ brew install openssl + $ brew install boost\@1.60 -c++11 && \ (cd /usr/local/lib && ln -s libboost_thread-mt.a libboost_thread.a && \ ln -s libboost_thread-mt.dylib libboost_thread.dylib) $ brew install yajl From c8b24b488cb0d2ba18b0876eece641ba622cb2a3 Mon Sep 17 00:00:00 2001 From: Igor Peshansky Date: Mon, 21 May 2018 17:14:56 -0400 Subject: [PATCH 4/4] Typo fix. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 46d23535..0f08fb5c 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ This is the Stackdriver metadata agent. 1. Install runtime dependencies: - *Note: this currently does not works with boost@1.67, which is the latest + *Note: this currently does not work with boost@1.67, which is the latest available from Homebrew as of 2018/05/17*. $ brew install openssl