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 <eloy.coto@gmail.com>
  • Loading branch information
eloycoto committed Mar 2, 2020
1 parent 3616bc4 commit bebd3de
Show file tree
Hide file tree
Showing 2 changed files with 4 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
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,9 @@ $(S2I_CONTEXT)/Roverfile.lock : $(S2I_CONTEXT)/Roverfile $(S2I_CONTEXT)/apicast-
$(ROVER) lock --roverfile=$(S2I_CONTEXT)/Roverfile

lua_modules: $(ROVER) $(S2I_CONTEXT)/Roverfile.lock
$(ROVER) install --roverfile=$(S2I_CONTEXT)/Roverfile > /dev/null
# This variable is to skip issues with openssl 1.1.1
# https://github.com/wahern/luaossl/issues/175
EXTRA_CFLAGS="-DHAVE_EVP_KDF_CTX=1" $(ROVER) install --roverfile=$(S2I_CONTEXT)/Roverfile

lua_modules/bin/rover:
@LUAROCKS_CONFIG=$(S2I_CONTEXT)/config-5.1.lua luarocks install --server=http://luarocks.org/dev lua-rover --tree=lua_modules 1>&2
Expand Down

0 comments on commit bebd3de

Please sign in to comment.