From 46b284afd982731e0648d00f571d0a2392cc0e0f Mon Sep 17 00:00:00 2001 From: Eloy Coto Date: Fri, 28 Feb 2020 17:54:14 +0100 Subject: [PATCH] Makefile: set env variable for luaossl This is a fix to build luaossl with OpenSSL 1.1.1. Related issue: https://github.com/wahern/luaossl/issues/175 Signed-off-by: Eloy Coto --- .circleci/config.yml | 2 +- Makefile | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1785401e9..b31018cb5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -192,7 +192,7 @@ jobs: name: Cleanup local dependencies command: rm -rf lua_modules - restore-lua-cache - - run: make lua_modules + - run: make lua_modules HAVE_EVP_KDF_CTX=1 - save_cache: key: apicast-rocks-{{ arch }}-{{ checksum "gateway/Roverfile.lock" }} <<: *lua-cache-paths diff --git a/Makefile b/Makefile index f9a75fa97..d54f5dad3 100644 --- a/Makefile +++ b/Makefile @@ -221,7 +221,11 @@ rover: $(ROVER) $(S2I_CONTEXT)/Roverfile.lock : $(S2I_CONTEXT)/Roverfile $(S2I_CONTEXT)/apicast-scm-1.rockspec $(ROVER) lock --roverfile=$(S2I_CONTEXT)/Roverfile -lua_modules: $(ROVER) $(S2I_CONTEXT)/Roverfile.lock +# This variable is to skip issues with openssl 1.1.1 +# https://github.com/wahern/luaossl/issues/175 +lua_modules: $(HAVE_EVP_KDF_CTX) $(ROVER) $(S2I_CONTEXT)/Roverfile.lock + echo "$$HAVE_EVP_KDF_CTX" + env $(ROVER) install --roverfile=$(S2I_CONTEXT)/Roverfile > /dev/null lua_modules/bin/rover: