Skip to content

Commit

Permalink
Makefile: set env variable for luaossl
Browse files Browse the repository at this point in the history
This is a fix to build luaossl with OpenSSL 1.1.1.

Related issue: wahern/luaossl#175

Signed-off-by: Eloy Coto <[email protected]>
  • Loading branch information
eloycoto committed Feb 28, 2020
1 parent 3616bc4 commit 46b284a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 46b284a

Please sign in to comment.