From 545897af503be32312f0ba3e57c60639ef8e2be7 Mon Sep 17 00:00:00 2001 From: "jinhua.tan" Date: Thu, 27 Feb 2020 18:50:17 +0800 Subject: [PATCH] bugfix: use to LUA_ORIGIN_DEFAULT_CPATH instead of LUA_DEFAULT_PATH avoid dquote in CFLAGS fix this issue: https://github.com/openresty/openresty/issues/587 --- util/configure | 5 ++--- util/mirror-tarballs | 12 ++++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/util/configure b/util/configure index 510e27f..bedc5b6 100755 --- a/util/configure +++ b/util/configure @@ -962,9 +962,8 @@ int main(void) { { print $in <<"_EOC_"; -ngx_lua_dquote='"' -CFLAGS="\$CFLAGS -DLUA_DEFAULT_PATH='\${ngx_lua_dquote}$site_lualib_prefix/?.ljbc;$site_lualib_prefix/?/init.ljbc;$lualib_prefix/?.ljbc;$lualib_prefix/?/init.ljbc;$site_lualib_prefix/?.lua;$site_lualib_prefix/?/init.lua;$lualib_prefix/?.lua;$lualib_prefix/?/init.lua\$ngx_lua_dquote'" -CFLAGS="\$CFLAGS -DLUA_DEFAULT_CPATH='\${ngx_lua_dquote}$site_lualib_prefix/?.so;$lualib_prefix/?.so\$ngx_lua_dquote'" +CFLAGS="\$CFLAGS -DLUA_ORIGIN_DEFAULT_PATH='$site_lualib_prefix/?.ljbc;$site_lualib_prefix/?/init.ljbc;$lualib_prefix/?.ljbc;$lualib_prefix/?/init.ljbc;$site_lualib_prefix/?.lua;$site_lualib_prefix/?/init.lua;$lualib_prefix/?.lua;$lualib_prefix/?/init.lua'" +CFLAGS="\$CFLAGS -DLUA_ORIGIN_DEFAULT_CPATH='$site_lualib_prefix/?.so;$lualib_prefix/?.so'" _EOC_ } diff --git a/util/mirror-tarballs b/util/mirror-tarballs index 0343442..6da5a86 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -548,10 +548,10 @@ mv openresty-drizzle-nginx-module-* drizzle-nginx-module-$ver || exit 1 ################################# -ver=0.10.16rc4 -$root/util/get-tarball "https://github.com/openresty/lua-nginx-module/archive/v$ver.tar.gz" -O lua-nginx-module-$ver.tar.gz || exit 1 +ver=origin_default_path +$root/util/get-tarball "https://github.com/rainingmaster/lua-nginx-module/archive/$ver.tar.gz" -O lua-nginx-module-$ver.tar.gz || exit 1 tar -xzf lua-nginx-module-$ver.tar.gz || exit 1 -mv lua-nginx-module-$ver ngx_lua-$ver || exit 1 +mv lua-nginx-module-$ver ngx_lua-0.10.16rc4 || exit 1 ################################# @@ -562,10 +562,10 @@ mv openresty-lua-upstream-nginx-module-* ngx_lua_upstream-$ver || exit 1 ################################# -ver=0.0.8rc2 -$root/util/get-tarball "https://github.com/openresty/stream-lua-nginx-module/tarball/v$ver" -O stream-lua-nginx-module-$ver.tar.gz || exit 1 +ver=origin_default_path +$root/util/get-tarball "https://github.com/rainingmaster/stream-lua-nginx-module/tarball/$ver" -O stream-lua-nginx-module-$ver.tar.gz || exit 1 tar -xzf stream-lua-nginx-module-$ver.tar.gz || exit 1 -mv openresty-stream-lua-nginx-module-* ngx_stream_lua-$ver || exit 1 +mv rainingmaster-stream-lua-nginx-module-* ngx_stream_lua-0.0.8rc2 || exit 1 #################################