This is an automated email from the ASF dual-hosted git repository.
monkeydluffy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new a7e09e791 refactor(makefile): add PCRE_INCDIR variable (#8433)
a7e09e791 is described below
commit a7e09e791a9a749cd90b543c18825a85197a39a7
Author: drgnchan <[email protected]>
AuthorDate: Wed Apr 12 14:55:34 2023 +0800
refactor(makefile): add PCRE_INCDIR variable (#8433)
---
Makefile | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Makefile b/Makefile
index abe654407..5a82f5e93 100644
--- a/Makefile
+++ b/Makefile
@@ -80,6 +80,9 @@ ifeq ($(ENV_OS_NAME), darwin)
ifeq ($(shell test -d $(ENV_HOMEBREW_PREFIX)/opt/openresty-openssl111
&& echo -n yes), yes)
ENV_OPENSSL_PREFIX :=
$(ENV_HOMEBREW_PREFIX)/opt/openresty-openssl111
endif
+ ifeq ($(shell test -d $(ENV_HOMEBREW_PREFIX)/opt/pcre && echo -n yes),
yes)
+ ENV_PCRE_PREFIX := $(ENV_HOMEBREW_PREFIX)/opt/pcre
+ endif
endif
@@ -153,6 +156,7 @@ deps: runtime
mkdir -p ~/.luarocks; \
$(ENV_LUAROCKS) config $(ENV_LUAROCKS_FLAG_LOCAL)
variables.OPENSSL_LIBDIR $(addprefix $(ENV_OPENSSL_PREFIX), /lib); \
$(ENV_LUAROCKS) config $(ENV_LUAROCKS_FLAG_LOCAL)
variables.OPENSSL_INCDIR $(addprefix $(ENV_OPENSSL_PREFIX), /include); \
+ [ '$(ENV_OS_NAME)' == 'darwin' ] && $(ENV_LUAROCKS) config
$(ENV_LUAROCKS_FLAG_LOCAL) variables.PCRE_INCDIR $(addprefix
$(ENV_PCRE_PREFIX), /include); \
$(ENV_LUAROCKS) install rockspec/apisix-master-0.rockspec
--tree=deps --only-deps --local $(ENV_LUAROCKS_SERVER_OPT); \
else \
$(call func_echo_warn_status, "WARNING: You're not using
LuaRocks 3.x; please remove the luarocks and reinstall it via
https://raw.githubusercontent.com/apache/apisix/master/utils/linux-install-luarocks.sh";);
\
